Merge branch 'kvm-arm64/hyp-reloc' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 12 Feb 2021 14:08:18 +0000 (14:08 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 12 Feb 2021 14:08:18 +0000 (14:08 +0000)
commite7ae2ecdc8410f52bef5c3e8159c706712ba5ca4
tree99efaea6124bed610e1d257e30f2992c8374fb6c
parentc5db649f3ded34096e84358e27be38931a691d99
parentbc93763f178fd04f484ee3e521bbdae57fddb891
Merge branch 'kvm-arm64/hyp-reloc' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/nvhe/Makefile
arch/arm64/kvm/hyp/nvhe/hyp-init.S
arch/arm64/kvm/hyp/nvhe/psci-relay.c