Merge branch 'kvm-arm64/nvhe-hyp-context' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 16 Sep 2020 09:59:17 +0000 (10:59 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 16 Sep 2020 09:59:17 +0000 (10:59 +0100)
commit81867b75dbfde82fda5476c7c219a777aa36fbaf
tree9e191345490da8200d0207f74fcac412eae82e7a
parentae8bd85ca8a4a812721388ab85b3d67077951f52
parenta071261d93184f43b7dede7516b6c449c4ed5770
Merge branch 'kvm-arm64/nvhe-hyp-context' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/kvm_host.h
arch/arm64/kvm/arm.c