From: Paolo Bonzini <pbonzini@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
Christoffer Dall <cdall@cs.columbia.edu>,
Marc Zyngier <marc.zyngier@arm.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "Linux-Next Mailing List" <linux-next@vger.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Radim Krčmář" <rkrcmar@redhat.com>, KVM <kvm@vger.kernel.org>,
"Dongjiu Geng" <gengdongjiu@huawei.com>,
"Janosch Frank" <frankja@linux.ibm.com>
Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
Date: Thu, 2 Aug 2018 15:18:57 +0200 [thread overview]
Message-ID: <632a8205-4344-3f6d-9216-ea623a32392a@redhat.com> (raw)
In-Reply-To: <20180802111916.7435c0ac@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 426 bytes --]
On 02/08/2018 03:19, Stephen Rothwell wrote:
>> -#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
>>
> This is now a conflict between the s390 and kvm-arm trees.
This will shortly move to the KVM tree. The ARM capability will have to
be bumped again since x86 "won" number 157.
Thanks,
Paolo
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-08-02 13:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 4:23 linux-next: manual merge of the kvms390 tree with the kvm-arm tree Stephen Rothwell
2018-08-02 1:19 ` Stephen Rothwell
2018-08-02 13:18 ` Paolo Bonzini [this message]
-- 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=632a8205-4344-3f6d-9216-ea623a32392a@redhat.com \
--to=pbonzini@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cdall@cs.columbia.edu \
--cc=cohuck@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=gengdongjiu@huawei.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=rkrcmar@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=sfr@canb.auug.org.au \
/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).