From patchwork Wed Apr 12 04:20:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9676441 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82FDB601C3 for ; Wed, 12 Apr 2017 04:23:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E1B828501 for ; Wed, 12 Apr 2017 04:23:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60E4F28510; Wed, 12 Apr 2017 04:23:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEC5928501 for ; Wed, 12 Apr 2017 04:23:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy9ly-0002dK-PM; Wed, 12 Apr 2017 04:20:50 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy9lw-0002dE-IX for Xen-devel@lists.xensource.com; Wed, 12 Apr 2017 04:20:49 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id D7/CE-03430-F1BADE85; Wed, 12 Apr 2017 04:20:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsWSLjbBWVd+9ds Ig31TBCzuTXnP7sDosb1vF3sAYxRrZl5SfkUCa8bLS29YCvq5K7YvaWJuYNzF2cXIxSEk0MMk 0djSwwjisAjMZ5GYd2slkMMJ5KhK7J5zhxXEZhPQlfj36jkTSJGIwCRmiTf/FrGBOMwCcxgl3 s5dwQZSJSzgLnH+4yUmEJtXwEzibNMxRghbUOLkzCcsIDazgJbEw1+3oGx5ie1v5zBPYOSeha RsFpKyWUjKFjAyr2JUL04tKkst0rXUSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQ IDBUGINjBeHdTwCFGSQ4mJVHeywpvI4T4kvJTKjMSizPii0pzUosPMcpwcChJ8DqtAsoJFqWm p1akZeYAgxYmLcHBoyTCe3UlUJq3uCAxtzgzHSJ1ilFRSpy3HaRPACSRUZoH1waLlEuMslLCv IxAhwjxFKQW5WaWoMq/YhTnYFQS5hUBmcKTmVcCN/0V0GImoMVndr0EWVySiJCSamCslfRkex e0bNqEGQ012lf2HtwgkdvWKmadXbY8leV3wd2MHW9TNu5I9K2ao6VcP+n3Z40jj9w4Li7a/+X ByRzJ8CX3e/t82SViPNfKLWyv3yin63tj0sUtyluT/xq/Oebok2WS+ehiwnmH4qtiTLMF5TZa PpGpMg9TSdjkzyH3IsxiSZw4b7ESS3FGoqEWc1FxIgBmDEotjwIAAA== X-Env-Sender: sfr@canb.auug.org.au X-Msg-Ref: server-16.tower-21.messagelabs.com!1491970844!58837173!1 X-Originating-IP: [103.22.144.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9879 invoked from network); 12 Apr 2017 04:20:46 -0000 Received: from ozlabs.org (HELO ozlabs.org) (103.22.144.67) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Apr 2017 04:20:46 -0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3w2rLy0LD3z9sN7; Wed, 12 Apr 2017 14:20:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1491970842; bh=X9nWZf9PeM/NVH/PXBQd8HiA2EwXigtKPAK/8e+ndmY=; h=Date:From:To:Cc:Subject:From; b=PLBk8B3jb5bJWerU6s9WaIizofy+k1HbBJuGJ0c6C3BQbTkq7sZhUohQYBoVgsMLB yGCYu3EDAINjyHub81Sem25TLhLtDkEUHWucDam6RVfTOpeT78riRBPyzY3dAjMWRC tGq6nTEo+eB1L4YX5FiKz71a/Iyg7TQ3Sn03mksIvrHsfamXU3s0R47MX3rWtg8GWw g/mlAW788SHfdj078IzjpMmI6PEKP1EV8aYfNVpoghG/DiOUZBOFsCellRS3yPxAb9 qq/xywC3GP+defT5R4stjzLvgssPuoV1XAWO1W8iYvL3Ux0ieYFCgmLUeYT44lozmR fWszJQyLWGt/Q== Date: Wed, 12 Apr 2017 14:20:41 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , David Vrabel , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Message-ID: <20170412142041.377473ac@canb.auug.org.au> MIME-Version: 1.0 Cc: Vitaly Kuznetsov , Linux-Next Mailing List , Linux Kernel Mailing List Subject: [Xen-devel] linux-next: manual merge of the xen-tip tree with the tip tree X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/mmu.c between commit: 66441bd3cfdc ("x86/boot/e820: Move asm/e820.h to asm/e820/api.h") from the tip tree and commit: 5159dc315db8 ("x86/xen: split off mmu_pv.c") from the xen-tip tree. The code changed in the former was moved to a new file by the latter, so I applied the following merge fix patch. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Wed, 12 Apr 2017 14:17:58 +1000 Subject: [PATCH] x86/xen: merge fix up for arch/x86/xen/mmu.c code movement Signed-off-by: Stephen Rothwell --- arch/x86/xen/mmu_pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 284d189f40dd..c98bfb9f0248 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include