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

Message-ID: <20250324201111.26dd80db@canb.auug.org.au>
Date: Mon, 24 Mar 2025 20:11:11 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Nick Terrell <terrelln@...com>, Thomas Gleixner <tglx@...utronix.de>,
 Ingo Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, Peter
 Zijlstra <peterz@...radead.org>
Cc: Ingo Molnar <mingo@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nick Terrell <terrelln@...a.com>
Subject: linux-next: manual merge of the zstd tree with the tip tree

Hi all,

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

  lib/zstd/common/portability_macros.h

between commit:

  1400c87e6cac ("zstd: Increase DYNAMIC_BMI2 GCC version cutoff from 4.8 to 11.0 to work around compiler segfault")

from the tip tree and commit:

  091697666ab0 ("zstd: Work around gcc segfault on versions older than 11.4")

from the zstd tree.

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