Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next

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

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

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

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

diff --cc include/uapi/linux/kvm.h
Simple merge

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