From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752999AbeAQMnc (ORCPT + 1 other); Wed, 17 Jan 2018 07:43:32 -0500 Received: from ozlabs.org ([103.22.144.67]:57527 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752738AbeAQMna (ORCPT ); Wed, 17 Jan 2018 07:43:30 -0500 Date: Wed, 17 Jan 2018 23:43:26 +1100 From: Stephen Rothwell To: Thomas Gleixner Cc: Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , David Woodhouse , Ingo Molnar , Brijesh Singh Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree Message-ID: <20180117234326.24a2c0c3@canb.auug.org.au> In-Reply-To: References: <20180117144817.1cba736f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Hi Thomas, On Wed, 17 Jan 2018 13:23:17 +0100 (CET) Thomas Gleixner wrote: > > On Wed, 17 Jan 2018, Paolo Bonzini wrote: > > On 17/01/2018 12:45, Thomas Gleixner wrote: > > > On Wed, 17 Jan 2018, Stephen Rothwell wrote: > > >> [This is the same conflict I reported the day before yesterday, but one > > >> of the commits has moved and another that contributed has been dropped.] > > >> diff --cc arch/x86/include/asm/cpufeatures.h > > >> index aa09559b2c0b,19f35be95f16..000000000000 > > >> --- a/arch/x86/include/asm/cpufeatures.h > > >> +++ b/arch/x86/include/asm/cpufeatures.h > > >> @@@ -211,7 -209,6 +211,8 @@@ > > >> #define X86_FEATURE_AVX512_4FMAPS ( 7*32+17) /* AVX-512 Multiply Accumulation Single precision */ > > >> > > >> #define X86_FEATURE_MBA ( 7*32+18) /* Memory Bandwidth Allocation */ > > >> +#define X86_FEATURE_RSB_CTXSW ( 7*32+19) /* Fill RSB on context switches */ > > >> ++#define X86_FEATURE_SEV ( 7*32+20) /* AMD Secure Encrypted Virtualization */ > > > Groan..... > > > > > > > Brijesh, > > > > please send out again the (host-side) SEV series so that they are merged > > through the TIP tree instead of kvm.git. > > > > Even though Boris did review it, there's just too much stuff in there > > outside arch/x86/kvm. > > No. Keep it and lets next time coordinate the relevant bits and pieces > better. I reserve that bit 20 and let Linus sort out the trivial conflict > when merging the stuff. I just picked that bit 20 when resolving the conflict. The original patch used bit 11, so the resolution could use any other sensible bit. -- Cheers, Stephen Rothwell