Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel...

Second round of KVM/ARM Changes for v4.12.

Changes include:
 - A fix related to the 32-bit idmap stub
 - A fix to the bitmask used to deode the operands of an AArch32 CP
   instruction
 - We have moved the files shared between arch/arm/kvm and
   arch/arm64/kvm to virt/kvm/arm
 - We add support for saving/restoring the virtual ITS state to
   userspace

diff --cc arch/arm/include/uapi/asm/kvm.h
Simple merge

diff --cc arch/arm64/include/uapi/asm/kvm.h
Simple merge

diff --cc arch/arm64/kvm/sys_regs.c
Simple merge

diff --cc include/kvm/arm_vgic.h
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc virt/kvm/arm/arm.c
Simple merge

diff --cc virt/kvm/arm/mmu.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic-init.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic.h
Simple merge