| Message ID | 20191031111242.50ab1eca@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Luca Coelho |
| Headers | show |
| Series | linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree | expand |
Stephen Rothwell <sfr@canb.auug.org.au> writes: > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/mvm.h > > between commit: > > 3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd") > > from the wireless-drivers tree and commit: > > 65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu") > > from the wireless-drivers-next tree. Thanks, the resolution looked simple enough so I'm not taking any extra actions because of this (for example merging wireless-drivers to wireless-drivers-next etc).
diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index 5ca50f39a023,a25712cce4ab..000000000000 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
Hi all, Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/mvm/mvm.h between commit: 3d206e6899a0 ("iwlwifi: fw api: support new API for scan config cmd") from the wireless-drivers tree and commit: 65b9425ce9aa ("iwlwifi: rx: use new api to get band from rx mpdu") from the wireless-drivers-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.