Merge tag 'kvm-arm-for-4-7-take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 24 May 2016 10:10:51 +0000 (12:10 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 24 May 2016 10:10:51 +0000 (12:10 +0200)
commit44bcc922381e24c4f38dc5dfd8d34d60b2ede898
treee7d680d230ff534c8e1c20c9121f7c41feb034d9
parent9842df62004f366b9fed2423e24df10542ee0dc5
parent35a2d58588f0992627e74b447ccab21570544c86
Merge tag 'kvm-arm-for-4-7-take2' of git://git./linux/kernel/git/kvmarm/kvmarm into kvm-next

KVM/ARM Changes for v4.7 take 2

"The GIC is dead; Long live the GIC"

This set of changes include the new vgic, which is a reimplementation of
our horribly broken legacy vgic implementation.  The two implementations
will live side-by-side (with the new being the configured default) for
one kernel release and then we'll remove it.

Also fixes a non-critical issue with virtual abort injection to guests.
arch/arm/include/asm/kvm_host.h
arch/arm64/include/asm/kvm_host.h