]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge commit 'kvm-vmx-nested-tsc-fix' into kvm-master
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 14 Jul 2022 14:04:12 +0000 (10:04 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 14 Jul 2022 14:04:44 +0000 (10:04 -0400)
Merge bugfix needed in both 5.19 (because it's bad) and 5.20 (because
it is a prerequisite to test new features).

1  2 
arch/x86/kvm/vmx/nested.c

Simple merge