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

[Borislav Petkov]

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