Merge tag 'kvm-arm-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Aug 2014 07:47:45 +0000 (09:47 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Aug 2014 07:47:45 +0000 (09:47 +0200)
commit5d5768660539b6d0da0d46113ffb0676540579a6
treec0cd7a918fc7371c5f5b1b9b04c6358966850277
parent5167d09ffad5b16b574d35ce3047ed34caf1e837
parentdedf97e8ff2c7513b1370e36b56e08b6bd0f0290
Merge tag 'kvm-arm-for-3.17' of git://git./linux/kernel/git/kvmarm/kvmarm into kvm

KVM/ARM New features for 3.17 include:
 - Fixes and code refactoring for stage2 kvm MMU unmap_range
 - Support unmapping IPAs on deleting memslots for arm and arm64
 - Support MMIO mappings in stage2 faults
 - KVM VGIC v2 emulation on GICv3 hardware
 - Big-Endian support for arm/arm64 (guest and host)
 - Debug Architecture support for arm64 (arm32 is on Christoffer's todo list)

Conflicts:
virt/kvm/arm/vgic.c [last minute cherry-pick from 3.17 to 3.16]
Documentation/arm64/booting.txt
arch/arm64/kernel/debug-monitors.c
virt/kvm/arm/vgic-v2.c
virt/kvm/arm/vgic.c