Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
From: Kalle Valo
Date: Thu Apr 26 2018 - 06:33:29 EST
Luciano Coelho <luciano.coelho@xxxxxxxxx> writes:
> On Thu, 2018-04-26 at 11:09 +1000, Stephen Rothwell wrote:
>> Hi all,
>> Today's linux-next merge of the wireless-drivers-next tree got a
>> conflict in:
>> between commit:
>> 77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
>> from the wireless-drivers tree and commits:
>> 9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common
>> 4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
>> 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
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any
>> complex conflicts.
> Thanks for resolving this, Stephen!
> I checked your resolution and it's spot on.
I now merged w-d to w-d-next to fix this, please check:
I was not sure what to do with these includes so I left them in: