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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250919204355.GHaM3AiwTM25LiOKAb@fat_crate.local>
Date: Fri, 19 Sep 2025 22:43:55 +0200
From: Borislav Petkov <bp@...en8.de>
To: Mark Brown <broonie@...nel.org>,
	Herbert Xu <herbert@...dor.apana.org.au>
Cc: 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 02:31:18PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/crypto/ccp/sev-dev.c
> 
> between commits:
> 
>   45d59bd4a3e0f ("crypto: ccp - Introduce new API interface to indicate SEV-SNP Ciphertext hiding feature")
>   33cfb80d1910b ("crypto: ccp - Add support for SNP_FEATURE_INFO command")
> 
> from the crypto tree and commit:
> 
>   e09701dcdd9ca ("crypto: ccp - Add new HV-Fixed page allocation/free API")

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

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette