From patchwork Fri Jun 9 23:29:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9779573 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 5CFBF6034B for ; Fri, 9 Jun 2017 23:30:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C2712857D for ; Fri, 9 Jun 2017 23:30:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D0F228640; Fri, 9 Jun 2017 23:30:16 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BD5B22857D for ; Fri, 9 Jun 2017 23:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zXg+xhKwRNpUuuRjSJ4KgSARMAw+f8FWH3fBy+xKD5E=; b=ZTxJdAx2sqRBPw tIPECwJ/Qoh+DjwFkynfVfZh3/x5SyI/Ii2hQADjb8oasjPcd5A0o7770kA918+L6Z07Cr9LYXs1/ SfGQF2WsZQ9WIm+2TTRxcf/Xmz+mlrc6urBzz2MguwIW4QEED9ttj/peFu5zH6da9R8v66gxMsecW LidPHiOQDhmdVJL849colGDfJgt7yPqI4fDlHeDUAGR/BviwH4CdAysyR2RZ2kt2dQY1Sqj84Tn5F eyYG/6dH2wk6Gti51zhWLeFJIx4hNL4JEDUHhDpHktpVgtvuJSmfjCgN70DBW5Z2xINVFpoLo6/rb 60k1xkmurEVjP2tzSrdQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dJTM6-0001jb-DZ; Fri, 09 Jun 2017 23:30:14 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dJTM2-0000RN-Rf for linux-arm-kernel@lists.infradead.org; Fri, 09 Jun 2017 23:30:13 +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 3wkz610zp6z9s74; Sat, 10 Jun 2017 09:29:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1497050985; bh=/GW+it3lsUUXhKfYxIOHys3uaJBsw08ixZ4JjxOe0B8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hrR8p+Bbj/qJfxGdqk3ITioDHvgUr8CVxsZ1is0EHt3eYVlRWKIo+kwFZK6lJKMdD hYJFdOK35dXaW8xirmUGCfFpgroqt3gJukvOgOGyFcDa7r8Fg2olSnFsmcpdy3vaML w9fpTKfNxxFISzMUHe91CF2D1km+GNFHp7E3l7yJ2xH41e14uEoG7bz4JJ44jHI02i mJTaxVNLQ4NhCWpldbAJ3UqUrRPX85UATEVmd5JCUJxsSoB74GfpaJRrccUciKjV83 sepp1RYO5P2GHfBuPyrJuzlIFJ2zs5ClsHqvToeikfywa9agZqVDa8bcrxVWi6I/WF H41UWDttcSmGQ== Date: Sat, 10 Jun 2017 09:29:44 +1000 From: Stephen Rothwell To: Yury Norov , Sumit Semwal Subject: Re: arm64: build is broken on next-20170609 with merge-commit 9afca2c4e379 (arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver) Message-ID: <20170610092944.4022d550@canb.auug.org.au> In-Reply-To: <20170609124325.p7b6fhdbwtki4w2z@yury-thinkpad> References: <20170609124325.p7b6fhdbwtki4w2z@yury-thinkpad> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170609_163011_451087_B1CA6D9F X-CRM114-Status: GOOD ( 13.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, Chen-Yu Tsai , Linux-Next Mailing List , LABBE Corentin , Olof Johansson , Maxime Ripard , "David S. Miller" , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Yury, On Fri, 9 Jun 2017 15:43:25 +0300 Yury Norov wrote: > > Today's linux-next breaks build with: > DTC arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb > arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb: ERROR (duplicate_node_names): Duplicate node name /soc/ethernet@1c30000 > ERROR: Input tree has errors, aborting (use -f to force output) > scripts/Makefile.lib:325: recipe for target 'arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb' failed > make[2]: *** [arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dtb] Error 2 > scripts/Makefile.build:561: recipe for target 'arch/arm64/boot/dts/allwinner' failed > make[1]: *** [arch/arm64/boot/dts/allwinner] Error 2 arch/arm64/Makefile:130: recipe for target 'dtbs' failed > make: *** [dtbs] Error 2 > > It seems, it's due to duplication error in merge-commit 9afca2c4e379. > Removing it fixes the build. Thanks for the reports Yury and Sumit. I will apply the following merge fixup patch when I next build linux-next (unless one of the patches is removed in the mean time). From: Stephen Rothwell Date: Sat, 10 Jun 2017 09:18:14 +1000 Subject: [PATCH] remove duplicate ethernet noce intruduced by merge caused by patch "arm64: allwinner: sun50i-a64: add dwmac-sun8i Ethernet driver" being merged into the sunxi and net-next trees as different commits (e53f67e981bc and 103aefa01c1b respectively). Presumably the former will turn up in the arm-soc tree before being sent to Linus. Signed-off-by: Stephen Rothwell --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 1b36aab5afb6..9d00622ce845 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -469,26 +469,6 @@ }; }; - emac: ethernet@1c30000 { - compatible = "allwinner,sun50i-a64-emac"; - syscon = <&syscon>; - reg = <0x01c30000 0x100>; - interrupts = ; - interrupt-names = "macirq"; - resets = <&ccu RST_BUS_EMAC>; - reset-names = "stmmaceth"; - clocks = <&ccu CLK_BUS_EMAC>; - clock-names = "stmmaceth"; - status = "disabled"; - #address-cells = <1>; - #size-cells = <0>; - - mdio: mdio { - #address-cells = <1>; - #size-cells = <0>; - }; - }; - gic: interrupt-controller@1c81000 { compatible = "arm,gic-400"; reg = <0x01c81000 0x1000>,