linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linus.walleij@linaro.org (Linus Walleij)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: build failure after merge of the arm-soc tree
Date: Wed, 8 Apr 2015 16:49:46 +0200	[thread overview]
Message-ID: <CACRpkdYmnEsVkfw64ihMP6BHK3+R0eiYqzHbEM1-hBcau1Nwwg@mail.gmail.com> (raw)
In-Reply-To: <2111946.bc0NbpO0Gp@wuerfel>

On Tue, Apr 7, 2015 at 2:28 PM, Arnd Bergmann <arnd@arndb.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@gmail.com> wrote:
>> > 2015-04-07 3:12 GMT+02:00 Stephen Rothwell <sfr@canb.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

  reply	other threads:[~2015-04-08 14:49 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-07  1:12 linux-next: build failure after merge of the arm-soc tree Stephen Rothwell
2015-04-07  8:43 ` Matthias Brugger
2015-04-07  9:28   ` Linus Walleij
2015-04-07  9:46     ` Matthias Brugger
2015-04-07 12:28     ` Arnd Bergmann
2015-04-08 14:49       ` Linus Walleij [this message]
2015-04-08 14:59         ` Matthias Brugger
2015-04-13 23:47           ` Stephen Rothwell
2015-04-14  0:05             ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
2023-06-13  0:43 Stephen Rothwell
2023-06-13  6:38 ` Linus Walleij
2023-01-16  5:27 Stephen Rothwell
2023-01-16 10:16 ` Arnd Bergmann
2022-03-01 22:50 Stephen Rothwell
2022-03-02  7:45 ` Arnd Bergmann
2022-03-02  9:52   ` Matthias Brugger
2022-03-03 17:23     ` Arnd Bergmann
2021-10-12  0:03 Stephen Rothwell
2021-10-12  7:35 ` Nicolas Ferre
2021-10-12  7:56   ` Arnd Bergmann
2021-10-12  9:29     ` Nicolas Ferre
2021-04-09 10:13 Stephen Rothwell
2021-04-09 10:56 ` Hector Martin
2020-11-23 22:31 Stephen Rothwell
2020-11-24  9:18 ` Christoph Hellwig
2020-11-24 10:43   ` Maxime Ripard
2019-08-13 22:49 Stephen Rothwell
2019-08-14 10:52 ` Arnd Bergmann
2018-07-15 23:13 Stephen Rothwell
2018-07-15 23:50 ` Olof Johansson
2018-07-16  0:38   ` Olof Johansson
2018-07-16  6:18   ` Robert Jarzmik
2016-04-25 23:43 Stephen Rothwell
2016-04-25 23:54 ` Arnd Bergmann
2016-04-26  0:51   ` Stephen Rothwell
2016-04-26  7:40     ` Arnd Bergmann
2015-12-17  6:40 Stephen Rothwell
2015-10-14 23:19 Stephen Rothwell
2015-10-15  2:40 ` Jisheng Zhang
2015-10-15 15:52   ` Arnd Bergmann
2015-10-15 14:10 ` Arnd Bergmann
2015-08-07  0:33 Stephen Rothwell
2015-06-12  0:30 Michael Ellerman
2015-06-12 18:19 ` Kevin Hilman
2014-10-02  1:37 Stephen Rothwell
2014-10-02  2:36 ` Kukjin Kim
2014-10-02 14:32 ` Arnd Bergmann
2014-10-03  6:50   ` Javier Martinez Canillas
2014-10-03  7:56     ` Russell King - ARM Linux
2014-10-03  8:07       ` Javier Martinez Canillas
2014-09-26  1:55 Stephen Rothwell
2014-09-26  2:57 ` Wei Xu
2014-09-30  0:12 ` Stephen Rothwell
2014-09-30  1:45   ` Wei Xu
2014-03-09 11:55 Mark Brown
2014-03-10 10:45 ` Will Deacon
2014-03-10 11:58   ` Catalin Marinas
2014-03-09 11:41 Mark Brown
2014-03-09 17:08 ` Olof Johansson
2014-03-09 19:08   ` Mark Brown
2013-04-19  6:46 Stephen Rothwell
2013-04-19 14:01 ` Olof Johansson
2013-04-22 13:26   ` Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CACRpkdYmnEsVkfw64ihMP6BHK3+R0eiYqzHbEM1-hBcau1Nwwg@mail.gmail.com \
    --to=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).