Messages in this thread | | | Date | Wed, 21 Sep 2011 13:55:47 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kvm tree with the s390 tree |
| |
Hi all,
Today's linux-next merge of the kvm tree got a conflict in include/linux/kvm.h between commit b6cf8788a338 ("[S390] kvm: extension capability for new address space layout") from the s390 tree and commit d36fe129f29a ("KVM: x86: Raise the hard VCPU count limit") from the kvm tree.
Just context changes. I fixed it up (see below) anc can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/kvm.h index aace6b8,55f5afb..0000000 --- a/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
| |