From: Marc Zyngier <maz@kernel.org>
Date: Fri, 18 Sep 2020 15:22:18 +0000 (+0100)
Subject: Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
X-Git-Tag: iomap-folio-5.17-old~2532^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8910f089606e7772933d49444fd1d7f4202a3947;p=users%2Fwilly%2Flinux.git

Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next

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

# Conflicts:
#	arch/arm64/kvm/mmu.c
---

8910f089606e7772933d49444fd1d7f4202a3947