From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752891AbeAQMgE (ORCPT + 1 other); Wed, 17 Jan 2018 07:36:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59828 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752276AbeAQMgC (ORCPT ); Wed, 17 Jan 2018 07:36:02 -0500 Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree To: Thomas Gleixner Cc: Stephen Rothwell , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , David Woodhouse , Ingo Molnar , Brijesh Singh References: <20180117144817.1cba736f@canb.auug.org.au> From: Paolo Bonzini Message-ID: Date: Wed, 17 Jan 2018 13:35:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 17 Jan 2018 12:36:02 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 17/01/2018 13:23, 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. Thank you. In the future we'll make sure to contact you before merging this kind of change. Thanks, Paolo