From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mackerras <paulus@ozlabs•org>,
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>,
"Suzuki K Poulose" <suzuki.poulose@arm•com>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
Date: Thu, 11 Oct 2018 13:06:23 +1100 [thread overview]
Message-ID: <20181011130623.59a160f5@canb.auug.org.au> (raw)
In-Reply-To: <20181010132224.3bee4dfd@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1560 bytes --]
Hi all,
On Wed, 10 Oct 2018 13:22:24 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the kvm-ppc tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commit:
>
> 233a7cb23531 ("kvm: arm64: Allow tuning the physical address size for VM")
>
> from the kvm-arm tree and commit:
>
> aa069a996951 ("KVM: PPC: Book3S HV: Add a VM capability to enable nested virtualization")
>
> 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 95aa73ca65dc,7f2ff3a76995..000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -962,7 -954,7 +963,8 @@@ struct kvm_ppc_resize_hpt
> #define KVM_CAP_NESTED_STATE 157
> #define KVM_CAP_ARM_INJECT_SERROR_ESR 158
> #define KVM_CAP_MSR_PLATFORM_INFO 159
> -#define KVM_CAP_PPC_NESTED_HV 160
> +#define KVM_CAP_ARM_VM_IPA_SIZE 160 /* returns maximum IPA bits for a VM */
> ++#define KVM_CAP_PPC_NESTED_HV 161
>
> #ifdef KVM_CAP_IRQ_ROUTING
>
This is now a conflict between the kvm tree and the kvm-arm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-10-11 2:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 2:22 linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell
2018-10-11 2:06 ` Stephen Rothwell [this message]
2018-10-11 8:58 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2019-10-25 1:54 Stephen Rothwell
2019-05-01 6:09 Stephen Rothwell
2019-05-01 10:48 ` Dave Martin
2017-04-20 3:36 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=20181011130623.59a160f5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=kvm@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=marc.zyngier@arm$(echo .)com \
--cc=paulus@ozlabs$(echo .)org \
--cc=pbonzini@redhat$(echo .)com \
--cc=rkrcmar@redhat$(echo .)com \
--cc=suzuki.poulose@arm$(echo .)com \
/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