Received: by 10.223.176.5 with SMTP id f5csp2876014wra; Thu, 1 Feb 2018 07:24:19 -0800 (PST) X-Google-Smtp-Source: AH8x226yHj/6yMQn0nBrSOBZFgZl3AsZULngNSvpbsZBeOJp4Ssaro9nmFz1i2kVsxR7mYYB6rgJ X-Received: by 10.98.26.143 with SMTP id a137mr37971704pfa.100.1517498659203; Thu, 01 Feb 2018 07:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517498659; cv=none; d=google.com; s=arc-20160816; b=OJGuhOEilO/m7yVEyMkQ4G2ApWtUMFG5K2qmtuMdXlgLEW5a6qP8BhOawEvUXGwwY9 IqGpCN1mwMOxaOK58NaFYqVwRtQcCR1A4w5hpyqu0SlAqAbhW6Fq8pFajT8Poh7JrJR/ DB8HZqIS4NQO6GuUREMDoucSJlUEoi7++frhffn1xuNZSQM2U1dq0HYwDfz3F7W8zIZh If+c5BdnC56YCxWU4J1HRwRLIbgWmsHW72VJV2M3mtWwNkCIkk5bUBm+833N4zXTvh0E gqObHf+l37B70g9PMU6oGgoFZd366LIoJYA2kDcT7Oh9ZWF+zQMSrPqw8R1Bba6wBQ3f 5URA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :arc-authentication-results; bh=REIiD5Y4mYtlDK10tNts0NnaDaVKgtxlm2/h0+5xfp4=; b=CzYUtrEMIdP59H8JcUhoTqtsO7lKLYRFMQPjjYdAwCXAzMpROR5cpKlhp96X4gtSO9 1PxD+aTMS8SbUBtOiO76boBjtWkolFnSIOWGNGLR895GeZx0d3ukhFnXDjHIot9gID3O G7kZyWm9FPu5qRTpM9HodXeWJO7jpvefp/P1GOZOpyOblFinWgWnmupTBwh+GsNe8kH+ UFIV3tla5JCQApp0ZnsdoemdqAMT93e1e/hD6QPF3j6GTm3/LXq6wYP8lcC26RmZIkdP nMuSaXW/cEZ12YkfWeCMMRrhz7t438WxinP6k8a+CtI3DvVmY5cLcxK76YrgZAWCASKw 4Zyw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n12si6695012pgs.536.2018.02.01.07.24.03; Thu, 01 Feb 2018 07:24:19 -0800 (PST) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752028AbeBAPXF (ORCPT + 99 others); Thu, 1 Feb 2018 10:23:05 -0500 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 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C7FE3AA17; Thu, 1 Feb 2018 15:23:03 +0000 (UTC) Received: from flask (unknown [10.43.2.80]) by smtp.corp.redhat.com (Postfix) with SMTP id 9164E80F9; Thu, 1 Feb 2018 15:22:58 +0000 (UTC) Received: by flask (sSMTP sendmail emulation); Thu, 01 Feb 2018 16:22:44 +0100 Date: Thu, 1 Feb 2018 16:22:44 +0100 From: Radim =?utf-8?B?S3LEjW3DocWZ?= To: Paolo Bonzini Cc: Stephen Rothwell , Christoffer Dall , KVM , Linux-Next Mailing List , Linux Kernel Mailing List , Marc Zyngier Subject: Re: linux-next: manual merge of the kvm tree with Linus' tree 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 Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 01 Feb 2018 15:23:03 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.