linux-next: manual merge of the wireless-next tree with Linus' and the wireless trees

linux-next: manual merge of the wireless-next tree with Linus' and the wireless trees

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]

Hi all,

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

  net/wireless/nl80211.c

between commits:

  1f860eb4cdda ("wifi: nl80211: disable multi-link reconfiguration")

from Linus' tree and

  2e85829ac7fb ("wifi: nl80211: fix assoc link handling")

from the wireless tree and commits:

  a096a8602f4f ("wifi: cfg80211: move link reconfig parameters into a struct")
  969241371f06 ("wifi: cfg80211: allow setting extended MLD capa/ops")

from the wireless-next tree.

I fixed it up (see below and I used the latter for the later hunk) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/wireless/nl80211.c
index 34c0dfeeb7fc,aee49d43cf86..000000000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -16512,10 -16518,7 +16524,10 @@@ static int nl80211_assoc_ml_reconf(stru
  
  	add_links = 0;
  	if (info->attrs[NL80211_ATTR_MLO_LINKS]) {
- 		err = nl80211_process_links(rdev, links,
 -		err = nl80211_process_links(rdev, req.add_links, NULL, 0, info);
++		err = nl80211_process_links(rdev, req.add_links,
 +					    /* mark as MLO, but not assoc */
 +					    IEEE80211_MLD_MAX_NUM_LINKS,
 +					    NULL, 0, info);
  		if (err)
  			return err;
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the wireless-next tree with Linus' and the wireless trees

[Johannes Berg]

Hi,

> Today's linux-next merge of the wireless-next tree got a conflict in:
> 
>   net/wireless/nl80211.c
> 
> between commits:
> 
>   1f860eb4cdda ("wifi: nl80211: disable multi-link reconfiguration")
> 
> from Linus' tree and
> 
>   2e85829ac7fb ("wifi: nl80211: fix assoc link handling")
> 
> from the wireless tree and commits:
> 
>   a096a8602f4f ("wifi: cfg80211: move link reconfig parameters into a struct")
>   969241371f06 ("wifi: cfg80211: allow setting extended MLD capa/ops")
> 
> from the wireless-next tree.

Thanks for the heads-up, I'll see how we can deal with it best.

> I fixed it up (see below and I used the latter for the later hunk)

That looks good, thanks.


Unrelated to this, but I see you've CC'ed Kalle. He no longer maintains
wireless, so if you have some list of people for trees or so you should
probably remove him.

Thanks,
johannes