Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP
authorMarc Zyngier <maz@kernel.org>
Tue, 28 Jul 2020 15:02:21 +0000 (16:02 +0100)
committerMarc Zyngier <maz@kernel.org>
Tue, 28 Jul 2020 15:02:21 +0000 (16:02 +0100)
commitfc279329a8aecfee50e010312c2dc373ab6810fb
treee16127c295734e861b64ba72aa24d906e1460251
parent300dca6853392829522be2ffb5d9a837b7c82296
parent11ac16a4290b72efa8328cb144b727f3cbbdfa6a
Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/Kconfig
arch/arm64/kvm/hyp/nvhe/hyp-init.S
arch/arm64/kvm/reset.c