All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>, <linuxppc-dev@ozlabs.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Wed, 9 Dec 2009 10:49:04 +1100	[thread overview]
Message-ID: <20091209104904.427eca89.sfr@canb.auug.org.au> (raw)

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
  

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Paul Mackerras <paulus@samba.org>,
	linuxppc-dev@ozlabs.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the powerpc tree with Linus' tree
Date: Wed, 9 Dec 2009 10:49:04 +1100	[thread overview]
Message-ID: <20091209104904.427eca89.sfr@canb.auug.org.au> (raw)

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
  

             reply	other threads:[~2009-12-08 23:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-08 23:49 Stephen Rothwell [this message]
2009-12-08 23:49 ` linux-next: manual merge of the powerpc tree with Linus' tree Stephen Rothwell
2014-05-29  2:04 Stephen Rothwell
2014-05-29  2:04 ` Stephen Rothwell
2016-05-01 23:50 Stephen Rothwell
2016-05-01 23:50 ` Stephen Rothwell
2016-06-29  0:35 Stephen Rothwell
2016-06-29  0:35 ` Stephen Rothwell
2016-06-29  5:24 ` Naveen N. Rao
2016-06-29  6:33   ` Michael Ellerman
2017-02-16 22:06 Stephen Rothwell
2017-10-30 12:51 Mark Brown
2017-11-13  5:37 ` Stephen Rothwell
2017-11-07 22:32 Stephen Rothwell
2018-08-14 23:19 Stephen Rothwell
2021-08-15 22:27 Stephen Rothwell
2021-08-15 22:27 ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091209104904.427eca89.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.