| Message ID | 20211221111950.57ecc6a7@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the mac80211-next tree with Linus' tree | expand |
diff --cc net/wireless/reg.c index f8f01a3e020b,58e4b33aff04..000000000000 --- a/net/wireless/reg.c
Hi all, Today's linux-next merge of the mac80211-next tree got a conflict in: net/wireless/reg.c between commit: e08ebd6d7b90 ("cfg80211: Acquire wiphy mutex on regulatory work") from Linus' tree and commit: 701fdfe348f7 ("cfg80211: Enable regulatory enforcement checks for drivers supporting mesh iface") from the mac80211-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.