OSDN Git Service

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

Simple merge