linux-kernel - Re: [GIT PULL] x86/cleanups for v6.14

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: <20250121113116.GAZ4-FhPI_xGpVMWzY@fat_crate.local>
Date: Tue, 21 Jan 2025 12:31:16 +0100
From: Borislav Petkov <bp@...en8.de>
To: Ingo Molnar <mingo@...nel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
	linux-kernel@...r.kernel.org,
	the arch/x86 maintainers <x86@...nel.org>
Subject: Re: [GIT PULL] x86/cleanups for v6.14

On Tue, Jan 21, 2025 at 08:34:29AM +0100, Ingo Molnar wrote:
> Merge note: if you've pulled x86/sev from Boris already, then there

Right, FWIW, I try to merge the branches locally here in the same order we
send them to Linus so that I can anticipate any merge conflicts.

> will be a new conflict in arch/x86/include/asm/cpufeatures.h due to 
> overlapping (but compatible) changes to the same lines of code.
> 
> My conflict resolution is below, for reference.

And yes, I can confirm the same resolution I've been doing here too.

Thx.

-- 
Regards/Gruss,
    Boris.

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