projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad36109 871b7ef)
Merge tag 'tags/for-kvmgt' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Nov 2016 14:19:43 +0000 (15:19 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Nov 2016 14:20:31 +0000 (15:20 +0100)
The three KVM patches that KVMGT needs.

Conflicts:
arch/x86/include/asm/kvm_page_track.h
arch/x86/kvm/mmu.c

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

diff --cc arch/x86/kvm/mmu.c
Simple merge
John Crispins staging tree