linux-next: manual merge of the powerpc tree with Linus' tree

Stephen Rothwell
2009-12-08T23:48:59Z

Hi all,

Today's linux-next merge of the powerpc tree got a conflict in
include/linux/kvm.h between commit
3cfc3092f40bc37c57ba556cfd8de4218f2135ab ("KVM: x86: Add
KVM_GET/SET_VCPU_EVENTS") (and others) from Linus' tree and commit
e15a113700324f7fdcee95589875daed2b98a2fe ("powerpc/kvm: Sync guest
visible MMU state") from the powerpc tree.

Just overlapping additions. I fixed it up (see below) and can carry the
fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc include/linux/kvm.h
index 2d241da,caf6173..0000000
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -487,15 -436,9 +487,18 @@@ struct kvm_ioeventfd
#endif
#define KVM_CAP_IOEVENTFD 36
#define KVM_CAP_SET_IDENTITY_MAP_ADDR 37
+#ifdef __KVM_HAVE_XEN_HVM
+#define KVM_CAP_XEN_HVM 38
+#endif
+#define KVM_CAP_ADJUST_CLOCK 39
+#define KVM_CAP_INTERNAL_ERROR_DATA 40
+#ifdef __KVM_HAVE_VCPU_EVENTS
+#define KVM_CAP_VCPU_EVENTS 41
+#endif
+#define KVM_CAP_S390_PSW 42
+ /* KVM upstream has more features, but we synched this number.
+ Linux, please remove this comment on rebase. */
+ #define KVM_CAP_PPC_SEGSTATE 43

#ifdef KVM_CAP_IRQ_ROUTING