Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v2 0/3] Per-VCPU MSR bitmaps patches - topic branch for
 x86/pti
To:     David Woodhouse <dwmw2@infradead.org>,
        linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc:     =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        KarimAllah Ahmed <karahmed@amazon.de>
References: <1517043027-7655-1-git-send-email-pbonzini@redhat.com>
 <1517230431.18619.12.camel@infradead.org>
From:   Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <8b7c9826-7327-9675-8e36-53d0ea5c0059@redhat.com>
Date:   Mon, 29 Jan 2018 15:28:11 +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: <1517230431.18619.12.camel@infradead.org>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 29/01/2018 13:53, David Woodhouse wrote:
> Hm, we are pushing the other bits through tip/x86/pti, which is still
> based on 4.14 so that everything can be backported easily. I was
> expecting to be able to pull a clean 4.14-based tree

Anything 4.14-based would have had conflicts all over due to the changes
that have already gone in for tip/x86/pti.  These three patches do
cherry-pick cleanly on top of 4.14.

If you give me the tree and commit id that you want me to use as a base,
I can rebase and give you a new topic branch.

Thanks,

Paolo

> which you had
> *also* pulled into the latest kvm.git and resolved any merge issues...
> but I just pulled a whole bunch of unrelated post-4.14 changes into my
> working tree.
> 
> How do you want to handle this?