| Message ID | 20240326100945.765b8caf@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 |
Hi Stephen, Thanks for the heads-up. > between commit: > > 5f4040050553 ("wifi: iwlwifi: mvm: disable MLO for the time being") > > from the wireless tree and commit: > > bbd6d0f8bc51 ("wifi: iwlwifi: mvm: advertise IEEE80211_HW_HANDLES_QUIET_CSA") > > from the wireless-next tree. I kind of knew this was going to happen (given how the patches applied or rather didn't), but nothing to prevent it yet. I think we'll get it fixed in due time, before all the -next stuff goes anywhere. Thanks, johannes
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 8f4b063d6243,6b8f18b3e280..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c between commit: 5f4040050553 ("wifi: iwlwifi: mvm: disable MLO for the time being") from the wireless tree and commit: bbd6d0f8bc51 ("wifi: iwlwifi: mvm: advertise IEEE80211_HW_HANDLES_QUIET_CSA") 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.