]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'kvm/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:58:12 +0000 (15:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:58:12 +0000 (15:58 +1000)
commitfbd68a3aa031cf3db8e58a2ecd91ca556fa3e5c8
tree838f807b3cdcbb067c6d870cdd2f91aacaffc87e
parent14e6f47c0ff37ae95584a1ba7cf5952dc5f53244
parent657f1d86a38e4b5d13551948c02cc8fc6987e3a5
Merge remote-tracking branch 'kvm/next'

# Conflicts:
# arch/x86/kvm/svm/nested.c
12 files changed:
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/mmu/mmu_internal.h
arch/x86/kvm/mmu/tdp_mmu.c
arch/x86/kvm/svm/avic.c
arch/x86/kvm/svm/sev.c
arch/x86/kvm/svm/svm.c
arch/x86/kvm/vmx/nested.c
arch/x86/kvm/vmx/vmx.c
arch/x86/kvm/x86.c
arch/x86/kvm/x86.h