Messages in this thread | | | From | Kalle Valo <> | Subject | Re: linux-next: manual merge of the net-next tree with the wireless-drivers tree | Date | Tue, 10 May 2016 09:43:16 +0300 |
| |
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/intel/iwlwifi/mvm/tx.c > > between commit: > > 5c08b0f5026f ("iwlwifi: mvm: don't override the rate with the AMSDU len") > > from the wireless-drivers tree and commit: > > d8fe484470dd ("iwlwifi: mvm: add support for new TX CMD API") > > from the net-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.
I'm planning to fix this by merging wireless-drivers to wireless-drivers-next later today and most likely tomorrow send a wireless-drivers-next pull request to Dave.
-- Kalle Valo
| |