From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@ozlabs•org>,
Marcelo Tosatti <mtosatti@redhat•com>,
Gleb Natapov <gleb@kernel•org>, KVM <kvm@vger•kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Alexey Kardashevskiy <aik@ozlabs•ru>,
James Hogan <james.hogan@imgtec•com>
Subject: linux-next: manual merge of the kvm-ppc tree with the kvm tree
Date: Fri, 7 Apr 2017 14:06:13 +1000 [thread overview]
Message-ID: <20170407140613.52df3583@canb.auug.org.au> (raw)
Hi Paul,
Today's linux-next merge of the kvm-ppc tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities")
from the kvm tree and commit:
2e60acebefd8 ("KVM: PPC: Reserve KVM_CAP_SPAPR_TCE_VFIO capability number")
from the kvm-ppc tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/uapi/linux/kvm.h
index 1e1a6c728a18,0f8a5e6528aa..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -887,9 -883,7 +887,10 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_PPC_MMU_RADIX 134
#define KVM_CAP_PPC_MMU_HASH_V3 135
#define KVM_CAP_IMMEDIATE_EXIT 136
-#define KVM_CAP_SPAPR_TCE_VFIO 137
+#define KVM_CAP_MIPS_VZ 137
+#define KVM_CAP_MIPS_TE 138
+#define KVM_CAP_MIPS_64BIT 139
++#define KVM_CAP_SPAPR_TCE_VFIO 140
#ifdef KVM_CAP_IRQ_ROUTING
next reply other threads:[~2017-04-07 4:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 4:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-04 8:04 linux-next: manual merge of the kvm-ppc tree with the kvm tree Stephen Rothwell
2014-08-05 10:00 ` James Hogan
2014-08-05 10:13 ` Stephen Rothwell
2014-08-05 11:39 ` Paolo Bonzini
2014-08-05 12:06 ` Stephen Rothwell
2014-07-28 6:53 Stephen Rothwell
2012-10-12 2:12 Stephen Rothwell
2012-09-04 5:04 Stephen Rothwell
2012-05-21 5:21 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=20170407140613.52df3583@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aik@ozlabs$(echo .)ru \
--cc=gleb@kernel$(echo .)org \
--cc=james.hogan@imgtec$(echo .)com \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mtosatti@redhat$(echo .)com \
--cc=paulus@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox