Commit 0ca77f8d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/apic' into x86/sev, to resolve conflict 



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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 9f8d92a1 d4bc3b11
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment