Merge branch 'kvm-vmx-secctl' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 10 Aug 2021 17:45:26 +0000 (13:45 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 10 Aug 2021 17:45:26 +0000 (13:45 -0400)
commitc3e9434c9852c09cd1756b05d1474b7c84452819
tree15c0dff034fcea01c6a48b9eae91c79e5e379866
parent32bdc01988413031c6e743714c2b40bdd773e5db
parent7b9cae027ba3aaac295ae23a62f47876ed97da73
Merge branch 'kvm-vmx-secctl' into HEAD

Merge common topic branch for 5.14-rc6 and 5.15 merge window.
arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/svm/sev.c
arch/x86/kvm/vmx/vmx.h
virt/kvm/kvm_main.c