From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cohuck@redhat.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>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>, KVM <kvm@vger.kernel.org>,
"Dongjiu Geng" <gengdongjiu@huawei.com>,
"Janosch Frank" <frankja@linux.ibm.com>
Subject: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
Date: Tue, 31 Jul 2018 14:23:39 +1000 [thread overview]
Message-ID: <20180731142339.19b52ce0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]
Hi all,
Today's linux-next merge of the kvms390 tree got a conflict in:
include/uapi/linux/kvm.h
between commit:
be26b3a73413 ("arm64: KVM: export the capability to set guest SError syndrome")
from the kvm-arm tree and commit:
a449938297e5 ("KVM: s390: Add huge page enablement control")
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 include/uapi/linux/kvm.h
index a7d9bc4e4068,b955b986b341..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -949,7 -949,7 +949,8 @@@ struct kvm_ppc_resize_hpt
#define KVM_CAP_GET_MSR_FEATURES 153
#define KVM_CAP_HYPERV_EVENTFD 154
#define KVM_CAP_HYPERV_TLBFLUSH 155
-#define KVM_CAP_S390_HPAGE_1M 156
+#define KVM_CAP_ARM_INJECT_SERROR_ESR 156
++#define KVM_CAP_S390_HPAGE_1M 157
#ifdef KVM_CAP_IRQ_ROUTING
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-07-31 4:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 4:23 Stephen Rothwell [this message]
2018-08-02 1:19 ` linux-next: manual merge of the kvms390 tree with the kvm-arm tree Stephen Rothwell
2018-08-02 13:18 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2022-11-16 3:03 Stephen Rothwell
2017-06-09 4:28 Stephen Rothwell
2017-06-28 6:02 ` Stephen Rothwell
2017-06-28 7:10 ` Christian Borntraeger
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=20180731142339.19b52ce0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=borntraeger@de.ibm.com \
--cc=cdall@cs.columbia.edu \
--cc=cohuck@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=gengdongjiu@huawei.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.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).