From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 30 Jun 2017 10:38:26 +0000 (+0200)
Subject: Merge tag 'kvmarm-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm... 
X-Git-Tag: v4.13-rc1~131^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=04a7ea04d508b925e7f829305b358157d58b4f82;p=linux.git

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

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

04a7ea04d508b925e7f829305b358157d58b4f82
diff --cc arch/s390/include/asm/kvm_host.h
index 41142d7cf988,9c3bd94204ac..495aedbaf447
--- a/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