From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 21 Nov 2019 08:58:35 +0000 (+0100)
Subject: Merge tag 'kvmarm-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=14edff88315a;p=linux.git

Merge tag 'kvmarm-5.5' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for Linux 5.5:

- Allow non-ISV data aborts to be reported to userspace
- Allow injection of data aborts from userspace
- Expose stolen time to guests
- GICv4 performance improvements
- vgic ITS emulation fixes
- Simplify FWB handling
- Enable halt pool counters
- Make the emulated timer PREEMPT_RT compliant

Conflicts:
	include/uapi/linux/kvm.h
---

14edff88315add29099fd8eebb9ef989c2e47c18
diff --cc include/uapi/linux/kvm.h
index ce8cfcc51aecc,fb47c0fad6a60..e6f17c8e2dbac
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1000,7 -1006,8 +1006,9 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_PMU_EVENT_FILTER 173
  #define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
  #define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175
 -#define KVM_CAP_ARM_NISV_TO_USER 176
 -#define KVM_CAP_ARM_INJECT_EXT_DABT 177
 +#define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
++#define KVM_CAP_ARM_NISV_TO_USER 177
++#define KVM_CAP_ARM_INJECT_EXT_DABT 178
  
  #ifdef KVM_CAP_IRQ_ROUTING