From: Dave Martin <Dave.Martin@arm•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Paul Mackerras" <paulus@ozlabs•org>,
"Christoffer Dall" <cdall@cs•columbia.edu>,
"Marc Zyngier" <marc.zyngier@arm•com>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Amit Daniel Kachhap" <amit.kachhap@arm•com>,
"Cédric Le Goater" <clg@kaod•org>
Subject: Re: linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree
Date: Wed, 1 May 2019 11:48:01 +0100 [thread overview]
Message-ID: <20190501104758.GM3567@e103592.cambridge.arm.com> (raw)
In-Reply-To: <20190501160902.49dcf348@canb.auug.org.au>
On Wed, May 01, 2019 at 04:09:02PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm-ppc tree got a conflict in:
>
> include/uapi/linux/kvm.h
>
> between commits:
>
> 555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support")
> a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest")
>
> from the kvm-arm tree and commit:
>
> eacc56bb9de3 ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE")
>
> 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 4dc34f8e29f6,52bf74a1616e..000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -988,9 -988,7 +988,10 @@@ struct kvm_ppc_resize_hpt
> #define KVM_CAP_ARM_VM_IPA_SIZE 165
> #define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
> #define KVM_CAP_HYPERV_CPUID 167
> -#define KVM_CAP_PPC_IRQ_XIVE 168
> +#define KVM_CAP_ARM_SVE 168
> +#define KVM_CAP_ARM_PTRAUTH_ADDRESS 169
> +#define KVM_CAP_ARM_PTRAUTH_GENERIC 170
> ++#define KVM_CAP_PPC_IRQ_XIVE 171
Looks good to me.
Cheers
---Dave
next prev parent reply other threads:[~2019-05-01 10:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-01 6:09 linux-next: manual merge of the kvm-ppc tree with the kvm-arm tree Stephen Rothwell
2019-05-01 10:48 ` Dave Martin [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-10-25 1:54 Stephen Rothwell
2018-10-10 2:22 Stephen Rothwell
2018-10-11 2:06 ` Stephen Rothwell
2018-10-11 8:58 ` Paolo Bonzini
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=20190501104758.GM3567@e103592.cambridge.arm.com \
--to=dave.martin@arm$(echo .)com \
--cc=amit.kachhap@arm$(echo .)com \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=clg@kaod$(echo .)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=sfr@canb$(echo .)auug.org.au \
/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