]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c5fa07 8f5c0d1)
Merge branch 'kvm-master' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 13 Oct 2015 19:32:50 +0000 (21:32 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 13 Oct 2015 19:32:50 +0000 (21:32 +0200)
commit15628b29b77a39a41ce9ee6694600fa4d7820e1b
tree5e6d8e459f282e35b8b8245a39de838a2c364d42tree | snapshot
parent9c5fa074f4f5d810252ce2dfcdc742ec3d27cb66commit | diff
parent8f5c0d1f920ca4a82f9f6f781855ae14be18833acommit | diff
Merge branch 'kvm-master' into HEAD

This merge brings in a couple important SMM fixes, which makes it
easier to test latest KVM with unrestricted_guest=0 and to test
the in-progress work on SMM support in the firmware.

Conflicts:
arch/x86/kvm/x86.c
arch/x86/include/asm/kvm_host.h diff1 | diff2 | blob | history
arch/x86/kvm/vmx.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.