Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

From: Kalle Valo <[email-masked]>
Date: Thu, 18 Apr 2019 16:49:02 +0300

Stephen Rothwell <[email-masked]> writes:

> Hi all,
>
> Today's linux-next merge of the wireless-drivers-next tree got a conflict
> in:
>
>   drivers/net/wireless/intel/iwlwifi/iwl-trans.h
>
> between commit:
>
>   07d35b4270ef ("iwlwifi: use sync nmi in case of init flow failure")
>
> from the wireless-drivers tree and commit:
>
>   4b1831e48974 ("iwlwifi: dbg_ini: support HW error trigger")
>
> 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.

Thanks, I'll let Dave know about this when he pulls w-d-next.

-- 
Kalle Valo