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

author Marc Zyngier <maz@kernel.org>

Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)

committer Marc Zyngier <maz@kernel.org>

Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
author Marc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
committer Marc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
diff --cc Documentation/virt/kvm/api.rst
Simple merge
diff --cc arch/arm64/kvm/arm.c
Simple merge
author	Marc Zyngier <maz@kernel.org>
	Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
committer	Marc Zyngier <maz@kernel.org>
	Tue, 13 Apr 2021 14:41:22 +0000 (15:41 +0100)
		1	2
Documentation/virt/kvm/api.rst	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/arm.c	patch \|	diff1 \|	diff2 \|	blob \| history