]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge branch 'x86/urgent' into x86/apic, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 16 Sep 2025 06:24:22 +0000 (08:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 16 Sep 2025 06:24:22 +0000 (08:24 +0200)
commit85df1cd15ff5d775e88e23b9fc2a9f429fa5b504
treea9988524f4a9dd1e0a5403ba8a99939b9c71af30
parent8d73829b78ca1a0e6eb93380f3bf5193d58c281c
parent7f830e126dc357fc086905ce9730140fd4528d66
Merge branch 'x86/urgent' into x86/apic, to resolve conflict

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/include/asm/sev.h