lkml.org 
[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree
Date
Stephen Rothwell <sfr@canb.auug.org.au> 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

\
 
 \ /
  Last update: 2019-04-18 15:49    [W:0.034 / U:1.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site