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>
Showing
- arch/powerpc/kvm/book3s_hv.c 3 additions, 2 deletionsarch/powerpc/kvm/book3s_hv.c
- arch/x86/include/asm/kvm_host.h 2 additions, 0 deletionsarch/x86/include/asm/kvm_host.h
- arch/x86/kvm/cpuid.c 4 additions, 0 deletionsarch/x86/kvm/cpuid.c
- arch/x86/kvm/cpuid.h 8 additions, 0 deletionsarch/x86/kvm/cpuid.h
- arch/x86/kvm/svm.c 1 addition, 0 deletionsarch/x86/kvm/svm.c
- arch/x86/kvm/vmx.c 1 addition, 0 deletionsarch/x86/kvm/vmx.c
- arch/x86/kvm/x86.c 14 additions, 2 deletionsarch/x86/kvm/x86.c
Loading
Please register or sign in to comment