Merge tag 'kvmarm-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm...

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

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

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

diff --cc include/linux/kvm_host.h
Simple merge

diff --cc include/uapi/linux/kvm.h
index ce8cfcc,fb47c0f..e6f17c8
--- 1/include/uapi/linux/kvm.h
--- 2/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
  

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