From patchwork Mon Aug 11 10:40:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Vrabel X-Patchwork-Id: 4706521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A98DD9F38D for ; Mon, 11 Aug 2014 10:43:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AE5F72010E for ; Mon, 11 Aug 2014 10:43:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9A93200E3 for ; Mon, 11 Aug 2014 10:43:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XGn2b-0002Rh-D4; Mon, 11 Aug 2014 10:41:25 +0000 Received: from smtp02.citrix.com ([66.165.176.63]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XGn2X-0002Oe-RU for linux-arm-kernel@lists.infradead.org; Mon, 11 Aug 2014 10:41:22 +0000 X-IronPort-AV: E=Sophos;i="5.01,840,1400025600"; d="scan'208";a="161194562" Message-ID: <53E89DAC.2070801@citrix.com> Date: Mon, 11 Aug 2014 11:40:44 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.5.0 MIME-Version: 1.0 To: Will Deacon , Mark Brown Subject: Re: master build: 1 failures 16 warnings (v3.16-8695-ga7d7a14) References: <20140808143227.GR17528@sirena.org.uk> <20140811100041.GM15344@arm.com> In-Reply-To: <20140811100041.GM15344@arm.com> X-DLP: MIA1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140811_034122_077685_FFAD27D2 X-CRM114-Status: GOOD ( 11.98 ) X-Spam-Score: -3.0 (---) Cc: "linaro-kernel@lists.linaro.org" , Russell King , konrad.wilk@oracle.com, Stefano Stabellini , Catalin Marinas , "kernel-build-reports@lists.linaro.org" , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, 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 On 11/08/14 11:00, Will Deacon wrote: > On Fri, Aug 08, 2014 at 03:32:27PM +0100, Mark Brown wrote: >> On Fri, Aug 08, 2014 at 01:20:31PM +0100, Build bot for Mark Brown wrote: >> >>> Failed defconfigs: >>> arm64-allmodconfig >> # >>> Errors: >> >>> arm64-allmodconfig >>> ../arch/arm64/xen/../../arm/xen/grant-table.c:53:5: error: conflicting types for 'arch_gnttab_init' >> >> This build failure which was present in -next has now appeared in Linus' >> tree too. It appears to be the result of a mismerge, we have two >> definitions of the function, one from b7dd0e350e0bd (x86/xen: safely map >> and unmap grant frames when in atomic context) with the old signature >> and one from 438b33c7145ca8a5131 (xen/grant-table: remove support for V2 >> tables). > > Stefano, Konrad: do you have a fix queued for this? I don't think there's a > lot I can do from the arm64 side. I am going to apply this patch. 8<------------------------ arm/xen: remove duplicate arch_gnttab_init() function This was introduced in commit e306e3be1cbe (Merge tag 'stable/for-linus-3.17-rc0-tag'). Signed-off-by: David Vrabel Acked-by: Stefano Stabellini --- arch/arm/xen/grant-table.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/xen/grant-table.c b/arch/arm/xen/grant-table.c index 2c4041c..e437918 100644 --- a/arch/arm/xen/grant-table.c +++ b/arch/arm/xen/grant-table.c @@ -49,8 +49,3 @@ int arch_gnttab_init(unsigned long nr_shared) { return 0; } - -int arch_gnttab_init(unsigned long nr_shared, unsigned long nr_status) -{ - return 0; -}