diff mbox series

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

Message ID 20230912124623.6591edd4@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the wireless-next tree with the wireless tree |

Commit Message

Stephen Rothwell Sept. 12, 2023, 2:46 a.m. UTC 
  Hi all,

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

  net/wireless/nl80211.c

between commit:

  37c20b2effe9 ("wifi: cfg80211: fix cqm_config access race")

from the wireless tree and commit:

  076fc8775daf ("wifi: cfg80211: remove wdev mutex")

from the wireless-next tree.

I fixed it up (I used a supplied resolution from Johannes - 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 mbox series

Patch

diff --cc net/wireless/nl80211.c
index 7a88361b3414,ab0aea7dca7d..fe06c238d4ef
--- a/net/wireless/nl80211.c