]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12a8344 8326b47)
Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Sun, 13 Dec 2015 07:29:57 +0000 (23:29 -0800)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Sun, 13 Dec 2015 07:29:57 +0000 (23:29 -0800)
* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  KVM: svm: unconditionally intercept #DB
  KVM: x86: work around infinite loop in microcode when #AC is delivered

1  2 
arch/x86/kvm/svm.c patch | diff1 | diff2 | blob | history
arch/x86/kvm/vmx.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kvm/svm.c
Simple merge
diff --cc arch/x86/kvm/vmx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.