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

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: <CAHk-=whRLe=TVzGE8sLKL6140evC+NDxP0=a81WjxqCbs9npRA@mail.gmail.com>
Date: Tue, 16 Jul 2024 11:15:21 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Borislav Petkov <bp@...en8.de>
Cc: x86-ml <x86@...nel.org>, lkml <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] x86/sev for v6.11-rc1

On Tue, 16 Jul 2024 at 02:56, Borislav Petkov <bp@...en8.de> 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