From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cornelia.huck@de.ibm.com>,
Christoffer Dall <cdall@cs.columbia.edu>,
Marc Zyngier <marc.zyngier@arm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andrew Jones <drjones@redhat.com>,
Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Subject: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
Date: Fri, 9 Jun 2017 14:28:56 +1000 [thread overview]
Message-ID: <20170609142856.461a9d28@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
arch/s390/include/asm/kvm_host.h
between commit:
2387149eade2 ("KVM: improve arch vcpu request defining")
from the kvm-arm tree and commit:
8611a6a64661 ("KVM: s390: CMMA tracking, ESSA emulation, migration mode")
from the kvms390 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 arch/s390/include/asm/kvm_host.h
index 9c3bd94204ac,a8cafed79eb4..000000000000
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@@ -42,9 -42,11 +42,11 @@@
#define KVM_HALT_POLL_NS_DEFAULT 80000
/* s390-specific vcpu->requests bit members */
-#define KVM_REQ_ENABLE_IBS 8
-#define KVM_REQ_DISABLE_IBS 9
-#define KVM_REQ_ICPT_OPEREXC 10
-#define KVM_REQ_START_MIGRATION 11
-#define KVM_REQ_STOP_MIGRATION 12
+#define KVM_REQ_ENABLE_IBS KVM_ARCH_REQ(0)
+#define KVM_REQ_DISABLE_IBS KVM_ARCH_REQ(1)
+#define KVM_REQ_ICPT_OPEREXC KVM_ARCH_REQ(2)
++#define KVM_REQ_START_MIGRATION KVM_ARCH_REQ(3)
++#define KVM_REQ_STOP_MIGRATION KVM_ARCH_REQ(4)
#define SIGP_CTRL_C 0x80
#define SIGP_CTRL_SCN_MASK 0x3f
next reply other threads:[~2017-06-09 4:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 4:28 Stephen Rothwell [this message]
2017-06-28 6:02 ` linux-next: manual merge of the kvms390 tree with the kvm-arm tree Stephen Rothwell
2017-06-28 7:10 ` Christian Borntraeger
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 3:03 Stephen Rothwell
2018-07-31 4:23 Stephen Rothwell
2018-08-02 1:19 ` Stephen Rothwell
2018-08-02 13:18 ` Paolo Bonzini
2016-07-20 5:34 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=20170609142856.461a9d28@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=borntraeger@de.ibm.com \
--cc=cdall@cs.columbia.edu \
--cc=cornelia.huck@de.ibm.com \
--cc=drjones@redhat.com \
--cc=imbrenda@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).