| Message ID | 20240422105623.7b1fbda2@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with the wireless tree | expand |
diff --cc net/mac80211/chan.c index 4e0c1a6e509f,dedf11eeb43c..380695fdc32f --- a/net/mac80211/chan.c
Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: net/mac80211/chan.c between commit: 89884459a0b9 ("wifi: mac80211: fix idle calculation with multi-link") from the wireless tree and commit: 87f5500285fb ("wifi: mac80211: simplify ieee80211_assign_link_chanctx()") 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.