linux-kernel - linux-next: manual merge of the crc 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>] [day] [month] [year] [list]

Message-ID: <20250618144750.092d01b8@canb.auug.org.au>
Date: Wed, 18 Jun 2025 14:47:50 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Eric Biggers <ebiggers@...nel.org>, Heiko Carstens <hca@...ux.ibm.com>,
 Vasily Gorbik <gor@...ux.ibm.com>, Christian Borntraeger
 <borntraeger@...ibm.com>
Cc: Alexander Gordeev <agordeev@...ux.ibm.com>, Eric Biggers
 <ebiggers@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the crc tree with the s390 tree

Hi all,

Today's linux-next merge of the crc tree got a conflict in:

  lib/crc/s390/crc32.h

between commit:

  65c9a9f92502 ("s390: Explicitly include <linux/export.h>")

from the s390 tree and commit:

  47e6269f497a ("lib/crc/s390: migrate s390-optimized CRC code into lib/crc/")

from the crc tree.

I fixed it up (I just used the latter version) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped