Merge tag 'kvmarm-for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

KVM/arm updates for 4.19

- Support for Group0 interrupts in guests
- Cache management optimizations for ARMv8.4 systems
- Userspace interface for RAS, allowing error retrival and injection
- Fault path optimization
- Emulated physical timer fixes
- Random cleanups

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc arch/arm/include/asm/kvm_emulate.h
Simple merge

diff --cc arch/arm64/include/asm/cpucaps.h
index be3bf3d08916ca811b9294c890adbae1f91b9783,ed84d65368305af521d26ad388321c4c03c7c03c..ae1f70450fb2129b5c195be0678ae9935bb3a450
--- 1/arch/arm64/include/asm/cpucaps.h
--- 2/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -49,8 -49,8 +49,9 @@@
  #define ARM64_HAS_CACHE_DIC                   28
  #define ARM64_HW_DBM                          29
  #define ARM64_SSBD                            30
 -#define ARM64_HAS_STAGE2_FWB                  31
 +#define ARM64_MISMATCHED_CACHE_TYPE           31
++#define ARM64_HAS_STAGE2_FWB                  32
  
--#define ARM64_NCAPS                           32
++#define ARM64_NCAPS                           33
  
  #endif /* __ASM_CPUCAPS_H */

diff --cc arch/arm64/include/asm/kvm_emulate.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

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

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

diff --cc include/linux/irqchip/arm-gic-v3.h
Simple merge

diff --cc include/uapi/linux/kvm.h
index 3cf632839337b7cf0288971e2612376d52de636d,a7d9bc4e406891e19020dd61ba729864fef19b8a..07548de5c9889f5bcd425a7273b2732003bf3c30
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -949,8 -949,7 +949,9 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_GET_MSR_FEATURES 153
  #define KVM_CAP_HYPERV_EVENTFD 154
  #define KVM_CAP_HYPERV_TLBFLUSH 155
 -#define KVM_CAP_ARM_INJECT_SERROR_ESR 156
 +#define KVM_CAP_S390_HPAGE_1M 156
 +#define KVM_CAP_NESTED_STATE 157
++#define KVM_CAP_ARM_INJECT_SERROR_ESR 158
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

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