From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 24 May 2016 10:10:51 +0000 (+0200)
Subject: Merge tag 'kvm-arm-for-4-7-take2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.7-rc1~32^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=44bcc922381e24c4f38dc5dfd8d34d60b2ede898;p=linux-2.6-block.git

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.
---

44bcc922381e24c4f38dc5dfd8d34d60b2ede898