| Message ID | 20231024112424.7de86457@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the net-next tree with the wireless tree | expand |
diff --cc net/mac80211/rx.c index 8f6b6f56b65b,051db97a92b4..000000000000 --- a/net/mac80211/rx.c
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mac80211/rx.c between commit: 91535613b609 ("wifi: mac80211: don't drop all unprotected public action frames") from the wireless tree and commit: 6c02fab72429 ("wifi: mac80211: split ieee80211_drop_unencrypted_mgmt() return value") from the net-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.