From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Brugger Subject: Re: linux-next: build failure after merge of the arm-soc tree Date: Wed, 8 Apr 2015 16:59:49 +0200 Message-ID: References: <20150407111217.2b2cf440@canb.auug.org.au> <2111946.bc0NbpO0Gp@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from mail-la0-f47.google.com ([209.85.215.47]:33577 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753173AbbDHO7w (ORCPT ); Wed, 8 Apr 2015 10:59:52 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Linus Walleij Cc: Arnd Bergmann , Stephen Rothwell , Hongzhou Yang , "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Olof Johansson , "linux-arm-kernel@lists.infradead.org" 2015-04-08 16:49 GMT+02:00 Linus Walleij : > On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann wrote: >> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote: >>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger >>> wrote: >>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell : >>> >> Hi all, >>> >> >>> >> After merging the arm-soc tree, today's linux-next build (arm >>> >> multi_v7_defconfig) failed like this: >>> >> >>> >> In file included from arch/arm/boot/dts/mt8135.dtsi:18:0, >>> >> from arch/arm/boot/dts/mt8135-evbp1.dts:16: >>> >> arch/arm/boot/dts/mt8135-pinfunc.h:18:40: fatal error: dt-bindings/pinctrl/mt65xx.h: No such file or directory >>> >> #include >>> >> ^ >>> >> >>> >> Caused by commit e6f219b8ec5e ("ARM: dts: mt8135: Add pinctrl/GPIO/EINT >>> >> node for mt8135"). >>> > >>> > This will be fixed as soon as Linus pinctrl for-next branch got merged [1]. >>> >>> Hm that's unfortunate, we do not rely on merge orders. >>> >>> Either the ARM SoC tree needs to pull in the pinctrl commit >>> or I need to carry this patch in the pinctrl tree. >>> >>> Is this sufficiently stand-alone to be merged into my tree >>> or do you need to go by the former approach? >> >> Let's just delay this patch to another merge window. You can add the >> driver now, and we should just revert the DT node addition in arm-soc, >> and then we'll add it in 4.2, or come up with a better solution. > > OK. I'm not applying it then. @arnd: I will send the patch in the next merge window then. Do you want me to do anything else for this merge window (e.g. resend the pull request without the patch)? Cheers, Matthias -- motzblog.wordpress.com