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

GICv4 Support for KVM/ARM for v4.15

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/arm/kvm/Kconfig
Simple merge

diff --cc arch/arm/kvm/Makefile
Simple merge

diff --cc arch/arm64/kvm/Kconfig
Simple merge

diff --cc arch/arm64/kvm/Makefile
Simple merge

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

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