From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree Date: Thu, 1 Feb 2018 16:22:44 +0100 Message-ID: <20180201152244.GC31080@flask> References: <20180201125512.7bc96674@canb.auug.org.au> <20180201104707.GA21802@cbox> <20180202002227.36db3356@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mx1.redhat.com ([209.132.183.28]:56164 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbeBAPXD (ORCPT ); Thu, 1 Feb 2018 10:23:03 -0500 Content-Disposition: inline In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Paolo Bonzini Cc: Stephen Rothwell , Christoffer Dall , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , Marc Zyngier 2018-02-01 09:21-0500, Paolo Bonzini: > On 01/02/2018 08:22, Stephen Rothwell wrote: > > Hi Christoffer, > > > > On Thu, 1 Feb 2018 11:47:07 +0100 Christoffer Dall wrote: > >> > >> While the suggested fix is functional it does result in some code > >> duplication, and the better resolution is the following: > > > > OK, I will use that resolution form tomorrow on. > > > > Someone needs to remember to let Linus know when the pull request is > > sent. > > It should be fixed in the KVM tree before it reaches Linus (when we > merge a topic branch that is common between x86/pti & KVM). I wasn't sure if the pti top branch is final, so I pulled hyper-v topic branch that also also contains v4.15. This and the SEV feature conflicts should be gone now, thanks.