lkml.org 
[lkml]   [2020]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
From
Date
On 12/1/20 7:20 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/ethernet/ibm/ibmvnic.c
>
> between commit:
>
> b71ec9522346 ("ibmvnic: Ensure that SCRQ entry reads are correctly ordered")
>
> from the net tree and commit:
>
> ec20f36bb41a ("ibmvnic: Correctly re-enable interrupts in NAPI polling routine")
>
> 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.
>
Hi, Stephen, thank you for fixing that conflict. Sorry for the
inconvenience.

\
 
 \ /
  Last update: 2020-12-02 18:16    [W:0.037 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site