Subject: linux-next: manual merge of the kvms390 tree with the kvm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 7 Apr 2015 18:41:19 +1000

Hi all,

Today's linux-next merge of the kvms390 tree got a conflict in
include/uapi/linux/kvm.h between commits 5fafd8748b36 ("MIPS: KVM: Wire
up FPU capability") and d952bd070f79 ("MIPS: KVM: Wire up MSA
capability") from the kvm tree and commits 47b43c52ee4b ("KVM: s390:
add ioctl to inject local interrupts") and 816c7667ea97 ("KVM: s390:
migrate vcpu interrupt state") from the kvms390 tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc include/uapi/linux/kvm.h
index 05a2083f7a28,c045c725e521..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -802,8 -809,8 +809,10 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_S390_MEM_OP 108
  #define KVM_CAP_S390_USER_STSI 109
  #define KVM_CAP_S390_SKEYS 110
 +#define KVM_CAP_MIPS_FPU 111
 +#define KVM_CAP_MIPS_MSA 112
+ #define KVM_CAP_S390_INJECT_IRQ 113
+ #define KVM_CAP_S390_IRQ_STATE 114
  
  #ifdef KVM_CAP_IRQ_ROUTING