Merge remote-tracking branch 'kvm-arm/next'

diff --cc arch/arm64/kvm/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/kvm_host.h
Simple merge

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
index 53deb2750bf62ac12fa503fc21cd7ef44a97578f,b28f0f142ecb92bdfe8aa4524fc3083e7ebacf43..9265196e877f34d662ea56a8d5993dcb4349ea57
--- 1/arch/x86/include/asm/kvm_host.h
--- 2/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@@ -1256,9 -1233,7 +1256,13 @@@ int x86_set_memory_region(struct kvm *k
  bool kvm_vcpu_is_reset_bsp(struct kvm_vcpu *vcpu);
  bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu);
  
 +bool kvm_intr_is_single_vcpu(struct kvm *kvm, struct kvm_lapic_irq *irq,
 +                           struct kvm_vcpu **dest_vcpu);
 +
 +void kvm_set_msi_irq(struct kvm_kernel_irq_routing_entry *e,
 +                   struct kvm_lapic_irq *irq);
++
+ static inline void kvm_arch_vcpu_blocking(struct kvm_vcpu *vcpu) {}
+ static inline void kvm_arch_vcpu_unblocking(struct kvm_vcpu *vcpu) {}
+ 
  #endif /* _ASM_X86_KVM_HOST_H */

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

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

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

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