On Thu, 2017-10-12 at 18:25 +0100, Mark Brown wrote:
> Hi all,
Hi Mark,
> Today's linux-next merge of the wireless-drivers-next tree got a
> conflict in:
>
> drivers/net/wireless/intel/iwlwifi/iwl-config.h
>
> between commit:
>
> dd05f9aab4426f ("iwlwifi: pcie: dynamic Tx command queue size")
>
> from the wireless-drivers tree and commit:
>
> 44fd09dad5d2b7 ("iwlwifi: nvm: set the correct offsets to 3168
> series")
>
> from the wireless-drivers-next tree.
This is weird... The previous conflict was the exact opposite of this.
44fd09 came in from wireless-drivers and dd05f9 came from wireless-
drivers-next. I don't understand why it is saying the opposite here...
--
Cheers,
Luca.
