]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge branch 'x86/apic' into x86/sev, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 5 Sep 2025 07:01:42 +0000 (09:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 5 Sep 2025 07:01:42 +0000 (09:01 +0200)
commit0ca77f8d33e8136b8926775380506f78a8d04811
treebb6d77ca7b4a8250dd2f2becc214107737be7119
parent9f8d92a1fbb5a08e17f9d405a1ab27be64096d8c
parentd4bc3b11c12b41fdb5650f5ad797de97f8dce869
Merge branch 'x86/apic' into x86/sev, to resolve conflict

 Conflicts:
arch/x86/include/asm/sev-internal.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/sev.c
arch/x86/coco/sev/core.c
arch/x86/coco/sev/vc-handle.c
arch/x86/include/asm/sev-internal.h
arch/x86/include/asm/sev.h