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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <d3da799c-bda6-4ac4-9adb-76261b1589ec@linux.ibm.com>
Date: Tue, 29 Jul 2025 16:01:17 +0200
From: Janosch Frank <frankja@...ux.ibm.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
        Christian Borntraeger <borntraeger@...ibm.com>,
        Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc: Andrew Donnellan <ajd@...ux.ibm.com>, Jinjie Ruan
 <ruanjinjie@...wei.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mark Rutland <mark.rutland@....com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the tip tree

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 <sfr@...b.auug.org.au>
> 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.