From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751657AbeA2Kfd (ORCPT <rfc822;w@1wt.eu>);
        Mon, 29 Jan 2018 05:35:33 -0500
Received: from mail-wm0-f44.google.com ([74.125.82.44]:37228 "EHLO
        mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750913AbeA2Kfa (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 29 Jan 2018 05:35:30 -0500
X-Google-Smtp-Source: AH8x2246NDoPLW+eaV1ZHrNuaJmOaMmIY/0QKdPkgLsHpTVoYAj0tk8ErbBqfMUbxMvu3oXWCSVSdg==
Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        KVM <kvm@vger.kernel.org>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        David Woodhouse <dwmw@amazon.co.uk>, Ingo Molnar <mingo@kernel.org>,
        Brijesh Singh <brijesh.singh@amd.com>
References: <20180117144817.1cba736f@canb.auug.org.au>
 <alpine.DEB.2.20.1801171243230.1777@nanos>
 <b54c26df-cee2-a930-7e34-47701e852f9e@redhat.com>
 <alpine.DEB.2.20.1801171321580.1777@nanos>
 <20180117234326.24a2c0c3@canb.auug.org.au>
 <alpine.DEB.2.20.1801171353100.1777@nanos>
 <20180129150208.4073e973@canb.auug.org.au>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <fb45f2c2-2025-af25-1604-dc8c2f7c00f6@redhat.com>
Date: Mon, 29 Jan 2018 11:35:29 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.2
MIME-Version: 1.0
In-Reply-To: <20180129150208.4073e973@canb.auug.org.au>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 29/01/2018 05:02, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 17 Jan 2018 13:53:26 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> wrote:
>>
>> On Wed, 17 Jan 2018, Stephen Rothwell wrote:
>>> On Wed, 17 Jan 2018 13:23:17 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> wrote:  
>>>> 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.  
>>
>> 20 is fine :)
> 
> So maybe this (X86_FEATURE_SEV) should be fixed up to use "( 7*32+20)" in
> the kvm tree?  (Just a followup patch changing the value/position in the
> file would be fine).

Yes, we'll fix this and the other conflicts with Linus's tree before
sending out the pull request.

Paolo