From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat.com>,
Gleb Natapov <gleb@kernel.org>, KVM <kvm@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Janakarajan Natarajan <Janakarajan.Natarajan@amd.com>,
Borislav Petkov <bp@suse.de>, Ingo Molnar <mingo@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree
Date: Mon, 4 Sep 2017 16:04:09 +1000 [thread overview]
Message-ID: <20170904160409.7df5042a@canb.auug.org.au> (raw)
In-Reply-To: <20170825143416.1673621d@canb.auug.org.au>
Hi all,
On Fri, 25 Aug 2017 14:34:16 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/x86/include/asm/cpufeatures.h
>
> between commit:
>
> 5442c2699552 ("x86/cpufeature, kvm/svm: Rename (shorten) the new "virtualized VMSAVE/VMLOAD" CPUID flag")
>
> from Linus' tree and commit:
>
> d837312dfd5b ("KVM: SVM: Add Virtual GIF feature definition")
>
> from the kvm 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/x86/include/asm/cpufeatures.h
> index 42bbbf0f173d,0e25e7a8ab03..000000000000
> --- a/arch/x86/include/asm/cpufeatures.h
> +++ b/arch/x86/include/asm/cpufeatures.h
> @@@ -287,7 -286,8 +287,8 @@@
> #define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */
> #define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */
> #define X86_FEATURE_AVIC (15*32+13) /* Virtual Interrupt Controller */
> -#define X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE (15*32+15) /* Virtual VMLOAD VMSAVE */
> +#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15) /* Virtual VMSAVE VMLOAD */
> + #define X86_FEATURE_VGIF (15*32+16) /* Virtual GIF */
>
> /* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */
> #define X86_FEATURE_AVX512VBMI (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-09-04 6:04 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 4:34 linux-next: manual merge of the kvm tree with Linus' tree Stephen Rothwell
2017-09-04 6:04 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-10 1:31 Stephen Rothwell
2022-07-13 6:02 Stephen Rothwell
2022-07-13 6:09 ` Paolo Bonzini
2022-06-09 0:33 Stephen Rothwell
2022-05-13 3:53 Stephen Rothwell
2022-03-30 23:42 Stephen Rothwell
2021-04-22 4:29 linux-next: manual merge of the kvm tree with Linus tree Stephen Rothwell
2020-12-17 2:56 linux-next: manual merge of the kvm tree with Linus' tree Stephen Rothwell
2020-04-02 2:36 Stephen Rothwell
2020-04-02 8:15 ` Paolo Bonzini
2020-04-02 10:44 ` Paolo Bonzini
2020-01-24 2:57 Stephen Rothwell
2019-05-17 1:16 Stephen Rothwell
2019-05-17 1:10 Stephen Rothwell
2019-05-17 1:04 Stephen Rothwell
2019-03-04 2:50 Stephen Rothwell
2018-10-18 2:37 Stephen Rothwell
2018-08-15 4:24 Stephen Rothwell
2018-08-15 4:20 Stephen Rothwell
2018-08-06 5:21 Stephen Rothwell
2018-06-04 7:04 Stephen Rothwell
2018-02-05 2:06 Stephen Rothwell
2018-02-05 1:06 Stephen Rothwell
2018-02-01 1:55 Stephen Rothwell
2018-02-01 10:47 ` Christoffer Dall
2018-02-01 13:22 ` Stephen Rothwell
2018-02-01 14:05 ` Christoffer Dall
2018-02-01 14:21 ` Paolo Bonzini
2018-02-01 15:22 ` Radim Krčmář
2018-02-01 15:30 ` Paolo Bonzini
2018-02-02 0:20 ` Stephen Rothwell
2018-02-02 17:22 ` Radim Krčmář
2018-01-25 21:07 Stephen Rothwell
2018-01-17 3:48 Stephen Rothwell
2018-01-17 11:45 ` Thomas Gleixner
2018-01-17 12:17 ` Paolo Bonzini
2018-01-17 12:23 ` Thomas Gleixner
2018-01-17 12:35 ` Paolo Bonzini
2018-01-17 12:37 ` Thomas Gleixner
2018-01-17 12:43 ` Stephen Rothwell
2018-01-17 12:53 ` Thomas Gleixner
2018-01-29 4:02 ` Stephen Rothwell
2018-01-29 10:35 ` Paolo Bonzini
2016-07-27 4:50 Stephen Rothwell
2015-05-25 7:25 Stephen Rothwell
2015-05-25 14:11 ` Paolo Bonzini
2015-02-09 6:11 Stephen Rothwell
2015-02-02 5:05 Stephen Rothwell
2015-02-02 5:03 Stephen Rothwell
2013-03-01 2:51 Stephen Rothwell
2013-02-07 3:20 Stephen Rothwell
2013-02-02 5:52 Stephen Rothwell
2012-09-12 4:33 Stephen Rothwell
2012-07-06 5:12 Stephen Rothwell
2010-05-13 3:43 Stephen Rothwell
2010-01-27 1:57 Stephen Rothwell
2010-01-27 16:38 ` Marcelo Tosatti
2009-11-06 0:21 Stephen Rothwell
2009-07-01 4:57 Stephen Rothwell
2009-07-01 7:10 ` Davide Libenzi
2009-07-01 7:32 ` Avi Kivity
2009-07-01 12:30 ` Gregory Haskins
2009-07-01 15:11 ` Davide Libenzi
2009-07-01 12:31 ` Gregory Haskins
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=20170904160409.7df5042a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Janakarajan.Natarajan@amd.com \
--cc=bp@suse.de \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mtosatti@redhat.com \
--cc=pbonzini@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).