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

Conflicts:
	include/linux/kvm.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc include/linux/kvm.h
index aace6b8691a2eee8b921dc46bcd7ff3ea624e45f,55f5afb75936beec0488144a459fb09b1ad73246..206979877888b63c25e58616dec3f51cfa92a733
--- 1/include/linux/kvm.h
--- 2/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -553,7 -553,7 +553,8 @@@ struct kvm_ppc_pvinfo 
  #define KVM_CAP_SPAPR_TCE 63
  #define KVM_CAP_PPC_SMT 64
  #define KVM_CAP_PPC_RMA       65
+ #define KVM_CAP_MAX_VCPUS 66       /* returns max vcpus per vm */
 +#define KVM_CAP_S390_GMAP 71
  
  #ifdef KVM_CAP_IRQ_ROUTING