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>


Author Ingo Molnar Date Commit Parent 8d73829b
+10746 -4712
849 changed files
+10746 -4712
849 changed files