| Message ID | 20240209105606.66e7808b@canb.auug.org.au |
|---|---|
| State | Superseded |
| Headers | show |
| Series | linux-next: manual merge of the wireless-next tree with the wireless tree | expand |
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 461f26d9214e,4981bb1f0251..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Hi all, Today's linux-next merge of the wireless-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/tx.c between commit: 2e57b77583ca ("wifi: iwlwifi: mvm: use correct address 3 in A-MSDU") from the wireless tree and commit: 3d869feacb74 ("wifi: iwlwifi: mvm: use FW rate for non-data only on new devices") 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.