]> www.infradead.org Git - users/hch/misc.git/commit
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 07:22:21 +0000 (17:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 07:22:21 +0000 (17:22 +1000)
commitf1abcac88bddc5d16aaad2d16223a6ea9baaefdf
tree13c60bf1012132a2158585e99ba939a7508100b6
parent4ae3c6b02351889b4c2d32101985022eeb5e536f
parent45eb29140e68ffe8e93a5471006858a018480a45
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git

# Conflicts:
# arch/x86/kvm/vmx/vmx.c
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/mmu.h
arch/x86/kvm/mmu/mmu.c
arch/x86/kvm/svm/svm.c
arch/x86/kvm/vmx/nested.c
arch/x86/kvm/vmx/pmu_intel.c
arch/x86/kvm/vmx/vmx.c
arch/x86/kvm/x86.c