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)
commit8320832940761e32cb6147a9ffb870eb6ba97065
tree5a776131637aa20dd5413a3abcbf23b57cdeed57
parente629003215e03a8260326b5626fdd655618a79bd
parent2d726d0db6ac479d91bf74490455badd34af6b1d
Merge remote-tracking branch 'arm64/for-next/vhe-only' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/hyp-stub.S