From patchwork Mon May 2 04:51:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 8989971 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 379BB9F39D for ; Mon, 2 May 2016 04:53:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5713D20173 for ; Mon, 2 May 2016 04:53:48 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 7E25F20154 for ; Mon, 2 May 2016 04:53:47 +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 1ax5p8-0005mn-EF; Mon, 02 May 2016 04:51:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax5p6-0005md-Jv for Xen-devel@lists.xensource.com; Mon, 02 May 2016 04:51:09 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B7/2B-03512-BBCD6275; Mon, 02 May 2016 04:51:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsWSLjbBWXf3HbV wgz/LuS3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa8abY1eYC3bwVDz5MY+5gbGfq4uRk0NIoIdJ 4tSUtC5GLg4WgVdMEt9/bmUBSbAIqEi8u/uICcRmE9CV+PfqORNIkYjAQSaJxQ/vs4I4zAITG CUm/j/IBlIlLOAucf7jJbAOXgEziXvnW6FsQYmTM5+ATWUW0JJ4+OsWlC0vsf3tHOYJjNyzkJ TNQlI2C0nZAkbmVYwaxalFZalFuoameklFmekZJbmJmTm6hoYmermpxcWJ6ak5iUnFesn5uZs YgaFSz8DAuIPx72nPQ4ySHExKoryTj6mFC/El5adUZiQWZ8QXleakFh9ilOHgUJLg5bsNlBMs Sk1PrUjLzAEGLUxagoNHSYR38XWgNG9xQWJucWY6ROoUo6KUOC8/SJ8ASCKjNA+uDRYplxhlp YR5GRkYGIR4ClKLcjNLUOVfMYpzMCoJ8/6+BTSFJzOvBG76K6DFTECLs9ergiwuSURISTUwNj 7LLPzTrrdeLES9/n3C93QGY5dis5kWM/ifMIYUVNr3/fu14eMaviVePcpVK45e+Ry0U69zrQV T+tP5Qu+867+eYT7Cee1bwCJ5lusT9riquSuotOws8bHK0qmITjLb2PUzPbPbzGFnktTUo85V qVXTPrwwETPhNnh+7xWzAY/1gih3XXYlluKMREMt5qLiRAAo6+nwjwIAAA== X-Env-Sender: sfr@canb.auug.org.au X-Msg-Ref: server-6.tower-27.messagelabs.com!1462164663!38990740!1 X-Originating-IP: [103.22.144.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64934 invoked from network); 2 May 2016 04:51:06 -0000 Received: from ozlabs.org (HELO ozlabs.org) (103.22.144.67) by server-6.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 2 May 2016 04:51:06 -0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3qysM91qsfz9t3p; Mon, 2 May 2016 14:51:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1462164661; bh=u7aY7lLRgdlOUIyK/bcfXhd5lQrJO+5D05HsZ7id1kg=; h=Date:From:To:Cc:Subject:From; b=Tnm4xgakFjzEX+HDng7K1PCghOqVwXK437rubLTDtdy1kvcYrwNRFaFt3R7M089ri p1prteQfGTzwfKmc6okRXB0USb0KKFNAaNYaWcAOyxxxM93v4idEVhL1fMMOBaezO/ QV7Qa77HMG72SI61gc4wSYqlHG+ChtISIGh7jCFw= Date: Mon, 2 May 2016 14:51:01 +1000 From: Stephen Rothwell To: Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Stefano Stabellini , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Message-ID: <20160502145101.151ea253@canb.auug.org.au> MIME-Version: 1.0 Cc: Matt Fleming , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org. Shannon Zhao" 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: drivers/xen/efi.c between commit: 0ec7ae928a9c ("efi: Remove unnecessary (and buggy) .memmap initialization from the Xen EFI driver") from the tip tree and commit: acb2c923a860 ("XEN: EFI: Move x86 specific codes to architecture directory") from the xen-tip tree. I fixed it up (I used the xen-tip version of this file and added the below merge fix patch) and can carry the fix as necessary. 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: Mon, 2 May 2016 14:47:32 +1000 Subject: [PATCH] xen: efi: merge fix patch Signed-off-by: Stephen Rothwell --- arch/x86/xen/efi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c index 86527f1d1427..3be012115853 100644 --- a/arch/x86/xen/efi.c +++ b/arch/x86/xen/efi.c @@ -83,7 +83,6 @@ static const struct efi efi_xen __initconst = { .get_next_high_mono_count = xen_efi_get_next_high_mono_count, .reset_system = NULL, /* Functionality provided by Xen. */ .set_virtual_address_map = NULL, /* Not used under Xen. */ - .memmap = NULL, /* Not used under Xen. */ .flags = 0 /* Initialized later. */ };