]> git.proxmox.com Git - mirror_ubuntu-kernels.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)
commita9b4fb7e79e7624c97c55e9c7562e3fe866ce70f
treef690b927077f73993bc7e01c10fc47cce0460b85
parented3cf15271fa150320b46f03d369777b71786298
parentc447e76b4cabb49ddae8e49c5758f031f35d55fb
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