Merge remote-tracking branch 'arm64/for-next/vhe-only' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:42:40 +0000 (15:42 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 13 Apr 2021 14:42:40 +0000 (15:42 +0100)
Signed-off-by: Marc Zyngier <maz@kernel.org>
1  2 
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/hyp-stub.S

Simple merge
Simple merge