]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1330a01 7391773)
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)
commit58f800d5ace99c49e6418cb5757d868f2746acb4
tree5e6d8e459f282e35b8b8245a39de838a2c364d42tree | snapshot
parent1330a0170a48ad3788eff01aaf889203652ab4c7commit | diff
parent73917739334c6509833b0403b81d4a04a8784bdfcommit | 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 for KaRo TX COM modules