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

Commit Message

Stephen Rothwell Feb. 17, 2022, 12:09 a.m. UTC

Hi all,

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

  net/mac80211/mlme.c

between commit:

  a72c01a94f1d ("mac80211: mlme: check for null after calling kmemdup")

from the net tree and commit:

  820acc810fb6 ("mac80211: Add EHT capabilities to association/probe request")

from the wireless-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.

Patch

diff --cc net/mac80211/mlme.c
index 20b57ddf149c,197cad4a2768..000000000000
--- a/net/mac80211/mlme.c