linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the arm-soc tree
Date: Tue, 12 Oct 2021 09:56:57 +0200	[thread overview]
Message-ID: <CAK8P3a0G9VoB71aBWGrtdxe2bNbv7apaAQqQXSf==TGwcKQvaw@mail.gmail.com> (raw)
In-Reply-To: <97e578a3-b12e-1975-717d-a0cf663673f0@microchip.com>

On Tue, Oct 12, 2021 at 9:35 AM Nicolas Ferre
<nicolas.ferre@microchip.com> wrote:
> On 12/10/2021 at 02:03, Stephen Rothwell wrote:
> >
> > After merging the arm-soc tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error
> > FATAL ERROR: Unable to parse input tree
> >
> > Caused by commit
> >
> >    9be4be3ed1ec ("Merge branch 'arm/dt' into for-next")

Thank you for the report!

I had verified the arm/dt branch by itself, but didn't recheck it after I
merged it into the for-next branch. At least that one is easy to fix
up as I don't send the combined branch to Linus, and the arm/dt
branch does not have the problem.

> I had following patch to have the nodes in alphabetical order:
>
...
>
> Sorry for not having mentioned this conflict in the pull-request.

No worries,

I had assumed you had them sorted by unit-address, so I had them
 in the wrong order as well. Fixing up both issues in for-next
now by redoing the merge.

       Arnd

  reply	other threads:[~2021-10-12  7:57 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-12  0:03 linux-next: build failure after merge of the arm-soc tree Stephen Rothwell
2021-10-12  7:35 ` Nicolas Ferre
2021-10-12  7:56   ` Arnd Bergmann [this message]
2021-10-12  9:29     ` Nicolas Ferre
  -- strict thread matches above, loose matches on Subject: below --
2023-07-24 23:50 Stephen Rothwell
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-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
2015-04-07  1:12 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
2015-04-08 14:59         ` Matthias Brugger
2015-04-13 23:47           ` Stephen Rothwell
2015-04-14  0:05             ` Arnd Bergmann
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
2011-10-04  0:26 Stephen Rothwell
2011-10-04  7:40 ` Arnd Bergmann
2011-10-04  9:39   ` Nicolas Ferre
2011-10-06  0:13   ` Stephen Rothwell
2011-10-07  9:09     ` Nicolas Ferre
2011-10-07 15:41       ` Arnd Bergmann

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='CAK8P3a0G9VoB71aBWGrtdxe2bNbv7apaAQqQXSf==TGwcKQvaw@mail.gmail.com' \
    --to=arnd@arndb.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    /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).