linux-kernel - Re: linux-next: build failure after merge of the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CACRpkdYmnEsVkfw64ihMP6BHK3+R0eiYqzHbEM1-hBcau1Nwwg@mail.gmail.com>
Date:	Wed, 8 Apr 2015 16:49:46 +0200
From:	Linus Walleij <linus.walleij@...aro.org>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Hongzhou Yang <hongzhou.yang@...iatek.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	Olof Johansson <olof@...om.net>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	Matthias Brugger <matthias.bgg@...il.com>
Subject: Re: linux-next: build failure after merge of the arm-soc tree

On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@...db.de> wrote:
> On Tuesday 07 April 2015 11:28:22 Linus Walleij wrote:
>> On Tue, Apr 7, 2015 at 10:43 AM, Matthias Brugger
>> <matthias.bgg@...il.com> wrote:
>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@...b.auug.org.au>:
>> >> 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 <dt-bindings/pinctrl/mt65xx.h>
>> >>                                         ^
>> >>
>> >> 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.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/