Re: [GIT PULL] x86/sev for v6.11-rc1

[Linus Torvalds]

On Tue, 16 Jul 2024 at 02:56, Borislav Petkov <bp@xxxxxxxxx> wrote:
>
> There's a simple merge conflict with your current tree to which I'm adding the
> resolve at the end of this mail.

Apparently it's not very simple, because I'm pretty sure your
resolution is wrong.

>  +#define X86_FEATURE_DEBUG_SWAP                (19*32+14) /* "debug_swap" AMD SEV-ES full debug state swap support */
> + #define X86_FEATURE_SVSM              (19*32+28) /* SVSM present */

That line should be

  #define X86_FEATURE_SVSM        (19*32+28) /* "svsm" SVSM present */

as far as I can tell.

               Linus