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

KVM/ARM updates for 4.13

- vcpu request overhaul
- allow timer and PMU to have their interrupt number
  selected from userspace
- workaround for Cavium erratum 30115
- handling of memory poisonning
- the usual crop of fixes and cleanups

Conflicts:
	arch/s390/include/asm/kvm_host.h

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

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/s390/include/asm/kvm_host.h
index 41142d7cf988b3de068b6feaa564987f8ff611a3,9c3bd94204ac8058e684810d743f8ef86ce9f5ff..495aedbaf44757018b7bb4d217b6d94f563c3910
--- 1/arch/s390/include/asm/kvm_host.h
--- 2/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@@ -42,11 -42,9 +42,11 @@@
  #define KVM_HALT_POLL_NS_DEFAULT 80000
  
  /* s390-specific vcpu->requests bit members */
- #define KVM_REQ_ENABLE_IBS         8
- #define KVM_REQ_DISABLE_IBS        9
- #define KVM_REQ_ICPT_OPEREXC       10
- #define KVM_REQ_START_MIGRATION   11
- #define KVM_REQ_STOP_MIGRATION    12
+ #define KVM_REQ_ENABLE_IBS    KVM_ARCH_REQ(0)
+ #define KVM_REQ_DISABLE_IBS   KVM_ARCH_REQ(1)
+ #define KVM_REQ_ICPT_OPEREXC  KVM_ARCH_REQ(2)
++#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3)
++#define KVM_REQ_STOP_MIGRATION  KVM_ARCH_REQ(4)
  
  #define SIGP_CTRL_C           0x80
  #define SIGP_CTRL_SCN_MASK    0x3f

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

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

diff --cc arch/x86/kvm/x86.c
Simple merge