Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git

# Conflicts:
#	arch/x86/kvm/svm/svm.c

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

diff --cc arch/x86/kernel/fpu/xstate.c
Simple merge

diff --cc arch/x86/kvm/Makefile
Simple merge

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

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

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

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

diff --cc arch/x86/kvm/svm/svm.c
index 9aaf83c8d57df7d3877484a87060769956dbb9cb,0f3b59da0d4a891431b9474c575552a133407026..c78a8c531e09f227ea91378a056e9cf92111a17d
--- 1/arch/x86/kvm/svm/svm.c
--- 2/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1524,8 -1511,12 +1516,8 @@@ static void svm_prepare_switch_to_guest
         * or subsequent vmload of host save area.
         */
        vmsave(sd->save_area_pa);
 -      if (sev_es_guest(vcpu->kvm)) {
 -              struct sev_es_save_area *hostsa;
 -              hostsa = (struct sev_es_save_area *)(page_address(sd->save_area) + 0x400);
 -
 -              sev_es_prepare_switch_to_guest(svm, hostsa);
 -      }
 +      if (sev_es_guest(vcpu->kvm))
-               sev_es_prepare_switch_to_guest(sev_es_host_save_area(sd));
++              sev_es_prepare_switch_to_guest(svm, sev_es_host_save_area(sd));
  
        if (tsc_scaling)
                __svm_write_tsc_multiplier(vcpu->arch.tsc_scaling_ratio);

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

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

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

diff --cc mm/ksm.c
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/migrate_device.c
Simple merge

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

diff --cc tools/testing/selftests/kvm/set_memory_region_test.c
Simple merge

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