Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:08 +0000 (15:41 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:41:08 +0000 (15:41 +0100)
commitbba8857febb1d0574480bd13a1be0567ac0f0ce9
treeab84931d77aafbbe55c20621fbe3e134aca84afd
parent3b7e56be786462423802ff84525b9a12539c5887
parentc8a4b35f5063c256451a3508e9f0b9e6b49debbb
Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/sysreg.h
arch/arm64/kvm/hyp/nvhe/hyp-init.S