Merge branch 'kvm-arm64/ptp' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc Documentation/virt/kvm/api.rst
Simple merge

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