linux-kernel - Re: linux-next: manual merge of the libcrypto tree with the s390 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: <20250730090540.52bdd52f@canb.auug.org.au>
Date: Wed, 30 Jul 2025 09:05:40 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Eric Biggers <ebiggers@...nel.org>, "Jason A. Donenfeld"
 <Jason@...c4.com>, Ard Biesheuvel <ardb@...nel.org>, Linux Crypto List
 <linux-crypto@...r.kernel.org>, Vasily Gorbik <gor@...ux.ibm.com>,
 Christian Borntraeger <borntraeger@...ibm.com>
Cc: Alexander Gordeev <agordeev@...ux.ibm.com>, Heiko Carstens
 <hca@...ux.ibm.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the libcrypto tree with the s390
 tree

Hi all,

On Fri, 4 Jul 2025 14:16:35 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the libcrypto tree got a conflict in:
> 
>   arch/s390/lib/crypto/sha256.c
> 
> between commit:
> 
>   65c9a9f92502 ("s390: Explicitly include <linux/export.h>")
> 
> from the s390 tree and commit:
> 
>   1a8f59dfdca0 ("lib/crypto: sha256: Consolidate into single module")
>   b8456f7aaf35 ("lib/crypto: s390: Move arch/s390/lib/crypto/ into lib/crypto/")
> 
> from the libcrypto tree.
> 
> I fixed it up (I removed the file) 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.

This is now a conflict between the s390 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped