linux-kernel - Re: linux-next: manual merge of the tip tree with the crypto 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: <aM4AoOSxD4SFo_Op@gondor.apana.org.au>
Date: Sat, 20 Sep 2025 09:17:20 +0800
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Borislav Petkov <bp@...en8.de>
Cc: Mark Brown <broonie@...nel.org>, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...nel.org>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Ashish Kalra <ashish.kalra@....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 tip tree with the crypto tree

On Fri, Sep 19, 2025 at 10:43:55PM +0200, Borislav Petkov wrote:
>
> Pff, in hindsight those should probably all go through the crypto tree so that
> there's no unnecessary conflicts.
> 
> Herbert, lemme know if I should undo them here and you take all three:
> 
> 648dbccc03a0 crypto: ccp - Add AMD Seamless Firmware Servicing (SFS) driver
> e09701dcdd9c crypto: ccp - Add new HV-Fixed page allocation/free API
> e4c00c4ce2aa x86/sev: Add new dump_rmp parameter to snp_leak_pages() API

I think either way we will end up with conflicts.  If I merge
them then we will get conflicts in x86/sev.  If you merge them
then we get the conflicts in drivers/crypto.

As the conflicts seem to be straightforward, how about we just
keep things as it is and mention it to Linus when the merge window
opens?

Cheers,
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt