linux-next: manual merge of the ath-next tree with the wireless tree

[Mark Brown]

Hi all,

Today's linux-next merge of the ath-next tree got a conflict in:

  drivers/net/wireless/ath/ath12k/wifi7/ahb.c

between commit:

  ce9d5197d651c ("wifi: ath12k: ahb: Revert undocumented ABI and dead code")

from the wireless tree and commit:

  c3bace8584ca7 ("wifi: ath12k: add support to load shared firmware on multiPD")

from the ath-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/net/wireless/ath/ath12k/wifi7/ahb.c
index 6e9e9034cba1a,a8f5cf8cc2a63..0000000000000
--- a/drivers/net/wireless/ath/ath12k/wifi7/ahb.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/ahb.c
@@@ -57,7 -108,8 +59,8 @@@ static int ath12k_wifi7_ahb_probe(struc
  	ab->hw_rev = desc->hw_rev;
  	ab->hif.ops = desc->ops;
  	ab_ahb->scm_auth_enabled = desc->auth_enabled;
+ 	ab_ahb->supports_multipd = desc->supports_multipd;
 -	ab_ahb->userpd_id = ath12k_wifi7_ahb_get_userpd_id(ab);
 +	ab_ahb->userpd_id = ATH12K_AHB_USERPD_ID_0;
  	if (!ab_ahb->userpd_id)
  		return -EOPNOTSUPP;

Attachment: signature.asc
Description: PGP signature