Subject: Re: linux-next: manual merge of the net tree with Linus' tree

From: Juergen Gross <[email-masked]>
Date: Thu, 8 Dec 2022 07:17:51 +0100

On 07.12.22 22:23, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net tree got a conflict in:
> 
>    drivers/net/xen-netback/rx.c
> 
> between commit:
> 
>    74e7e1efdad4 ("xen/netback: don't call kfree_skb() with interrupts disabled")
> 
> from Linus' tree and commit:
> 
>    9e6246518592 ("xen/netback: don't call kfree_skb() under spin_lock_irqsave()")
> 
> from the net tree.
> 
> I fixed it up (I just used the version from Linus' tree) 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.
> 

Yes, this is the correct solution. The patch in the net tree was not complete
and the other patch needed to pushed as it fixes a 0-day security issue.

Juergen