Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a9b4fb7e

Commit a9b4fb7e authored 9 years ago by Paolo Bonzini

Downloads
- Plain Diff

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>

parents ed3cf152 c447e76b

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

arch/powerpc/kvm/book3s_hv.c 3 additions, 2 deletions

arch/powerpc/kvm/book3s_hv.c
arch/x86/include/asm/kvm_host.h 2 additions, 0 deletions

arch/x86/include/asm/kvm_host.h
arch/x86/kvm/cpuid.c 4 additions, 0 deletions

arch/x86/kvm/cpuid.c
arch/x86/kvm/cpuid.h 8 additions, 0 deletions

arch/x86/kvm/cpuid.h
arch/x86/kvm/svm.c 1 addition, 0 deletions

arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c 1 addition, 0 deletions

arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c 14 additions, 2 deletions

arch/x86/kvm/x86.c

with 33 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment