Merge tag 'kvm-arm-fixes-for-v4.16-2' into HEAD

Resolve conflicts with current mainline

diff --cc arch/arm/kvm/hyp/Makefile
index 1964111c984a318a50479d97e021b6646f989681,63d6b404d88e39bf581c0434aff5d6b0e951279f..7fc0638f263ac975dc3a4bddd0c1ec00adc2348f
--- 1/arch/arm/kvm/hyp/Makefile
--- 2/arch/arm/kvm/hyp/Makefile
+++ b/arch/arm/kvm/hyp/Makefile
@@@ -7,6 -7,9 +7,8 @@@ ccflags-y += -fno-stack-protector -DDIS
  
  KVM=../../../../virt/kvm
  
 -obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o
+ CFLAGS_ARMV7VE                   :=$(call cc-option, -march=armv7ve)
+ 
  obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o
  obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
  

diff --cc include/kvm/arm_vgic.h
Simple merge

diff --cc virt/kvm/arm/arch_timer.c
Simple merge

diff --cc virt/kvm/arm/hyp/vgic-v3-sr.c
index b13cbd41dbc399f19410e8ca9e9252d729856953,b89ce5432214358e594c536bedf371a1b986e5ae..616e5a433ab0f76adfb0a12e0f9f436912352f38
--- 1/virt/kvm/arm/hyp/vgic-v3-sr.c
--- 2/virt/kvm/arm/hyp/vgic-v3-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v3-sr.c
@@@ -212,12 -211,13 +212,14 @@@ void __hyp_text __vgic_v3_save_state(st
  
        /*
         * Make sure stores to the GIC via the memory mapped interface
 -       * are now visible to the system register interface.
 +       * are now visible to the system register interface when reading the
 +       * LRs, and when reading back the VMCR on non-VHE systems.
         */
 -      if (!cpu_if->vgic_sre) {
 -              dsb(sy);
 -              isb();
 -              cpu_if->vgic_vmcr = read_gicreg(ICH_VMCR_EL2);
 +      if (used_lrs || !has_vhe()) {
-               if (!cpu_if->vgic_sre)
-                       dsb(st);
++              if (!cpu_if->vgic_sre) {
++                      dsb(sy);
++                      isb();
++              }
        }
  
        if (used_lrs) {

diff --cc virt/kvm/arm/vgic/vgic-v2.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic-v3.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic.h
Simple merge