Subject: Re: linux-next: manual merge of the kvms390 tree with the tip tree

From: Janosch Frank <[email-masked]>
Date: Tue, 29 Jul 2025 16:01:17 +0200

On 7/29/25 2:56 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>    include/linux/entry-common.h
> 
> between commit:
> 
>    a70e9f647f50 ("entry: Split generic entry into generic exception and syscall entry")
> 
> from the tip tree and commit:
> 
>    ee4a2e08c101 ("entry: Add arch_in_rcu_eqs()")
> 
> from the kvms390 tree.
> 
> I fixed it up (I used the former version of this file and applied the
> following merge fix patch) 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.
> 
> From: Stephen Rothwell <[email-masked]>
> Date: Tue, 29 Jul 2025 10:49:47 +1000
> Subject: [PATCH] fix up for "entry: Add arch_in_rcu_eqs()"
> 
> interacting with "entry: Split generic entry into generic exception and
> syscall entry" from the tip tree.

The patch from tip was a code move so this looks fine to me.