Merge branch 'next' of https://github.com/kvm-x86/linux.git

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/asm/msr.h
Simple merge

diff --cc arch/x86/kvm/svm/sev.c
Simple merge

diff --cc arch/x86/kvm/svm/svm.c
index ffb34dadff1c2f309a4600b3fca4cbf51bad472c,b36a7e886d4ec41a828dd801baae923a9c03ab0d..d933745572639ef4b7e13d33ead14e4fbd85ec8a
--- 1/arch/x86/kvm/svm/svm.c
--- 2/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -29,9 -29,9 +29,10 @@@
  #include <linux/cc_platform.h>
  #include <linux/smp.h>
  #include <linux/string_choices.h>
+ #include <linux/mutex.h>
  
  #include <asm/apic.h>
 +#include <asm/msr.h>
  #include <asm/perf_event.h>
  #include <asm/tlbflush.h>
  #include <asm/desc.h>

diff --cc arch/x86/kvm/vmx/nested.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc tools/arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc tools/arch/x86/include/uapi/asm/kvm.h
Simple merge

diff --cc tools/testing/selftests/kvm/Makefile.kvm
Simple merge