From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 22 Aug 2018 12:07:56 +0000 (+0200)
Subject: Merge tag 'kvmarm-for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: v4.19~325^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=631989303b06b8fdb15ec3b88aee2d25e80d4cec;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'kvmarm-for-v4.19' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

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
---

631989303b06b8fdb15ec3b88aee2d25e80d4cec
diff --cc arch/arm64/include/asm/cpucaps.h
index be3bf3d,ed84d65..ae1f704
--- a/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 include/uapi/linux/kvm.h
index 3cf6328,a7d9bc4..07548de
--- a/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