]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'kvm-master' into kvm-next
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 20 May 2015 09:46:12 +0000 (11:46 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 20 May 2015 10:31:37 +0000 (12:31 +0200)
commitee1aee5dea108226af1538a09ed2e92ac6e5cbde
treef690b927077f73993bc7e01c10fc47cce0460b85
parentbf6fb19e083410907dc440081aef154e47072ec3
parentc656c0403596acd1e34d1284c20d62156354038c
Merge branch 'kvm-master' into kvm-next

Grab MPX bugfix, and fix conflicts against Rik's adaptive FPU
deactivation patch.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/cpuid.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c