Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 18 Sep 2020 15:22:18 +0000 (16:22 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 18 Sep 2020 15:22:18 +0000 (16:22 +0100)
commit8910f089606e7772933d49444fd1d7f4202a3947
tree64e2bfeffc92ccc9631e68193dd7cb4cda7d6a90
parent81867b75dbfde82fda5476c7c219a777aa36fbaf
parentc9c0279cc02b4e161686de7ccd1973357f29db8c
Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
# Conflicts:
# arch/arm64/kvm/mmu.c