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

diff --cc Documentation/virt/kvm/api.rst
Simple merge

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

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

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

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/xen.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge