Merge branch 'kvm-arm64/target-table-no-more' into kvmarm-master/next-WIP

Signed-off-by: Marc Zyngier <[email protected]>

diff --cc arch/arm64/kvm/Makefile
index 152d8845a1a2a6afb0bf40e6df0d9311b1ec97a9,48cda50aa22575a7271f78e84424fa5eb83d0b42..99977c1972cc6bf041a12260dcff899bf3d758c6
--- 1/arch/arm64/kvm/Makefile
--- 2/arch/arm64/kvm/Makefile
+++ b/arch/arm64/kvm/Makefile
@@@ -13,8 -13,8 +13,8 @@@ obj-$(CONFIG_KVM) += hyp
  kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \
         $(KVM)/vfio.o $(KVM)/irqchip.o \
         arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \
 -       inject_fault.o regmap.o va_layout.o hyp.o hyp-init.o handle_exit.o \
 +       inject_fault.o regmap.o va_layout.o hyp.o handle_exit.o \
-        guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o \
+        guest.o debug.o reset.o sys_regs.o \
         vgic-sys-reg-v3.o fpsimd.o pmu.o \
         aarch32.o arch_timer.o \
         vgic/vgic.o vgic/vgic-init.o \

diff --cc arch/arm64/kvm/sys_regs.c
Simple merge