openbmc.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: "Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Cc: DTML <devicetree@vger.kernel.org>,
	Tomer Maimon <tmaimon77@gmail.com>,
	OpenBMC Maillist <openbmc@lists.ozlabs.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 00/10] Initial support for Nuvoton WPCM450 BMC SoC
Date: Fri, 9 Apr 2021 10:04:34 +0200	[thread overview]
Message-ID: <CAK8P3a18ySEmCzkdD-GmQSPFUza_TK3OBPk0Grbz_aFW72+g7g@mail.gmail.com> (raw)
In-Reply-To: <YHAI+x4OXBKvJkUH@latitude>

On Fri, Apr 9, 2021 at 9:58 AM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:
> On Fri, Apr 09, 2021 at 04:37:34AM +0000, Joel Stanley wrote:
> > On Tue, 6 Apr 2021 at 21:59, Jonathan Neuschäfer <j.neuschaefer@gmx.net> wrote:
> > I've had a look at the series and it looks good to me:
> >
> > Reviewed-by: Joel Stanley <joel@jms.id.au>
> >
> > Nice work Jonathan.
> >
> > I'll put this in it's own branch along with the bindings change it
> > depends on and send a pull request to Arnd for v5.13.
>
> Thanks a bunch!
>
> A few patches are going through other branches (IRQ bindings+driver;
> watchdog bindings+driver probably, I guess). That leaves the following
> patches to go into your branch, AFAIUI:
>
> [PATCH v2 01/10] dt-bindings: vendor-prefixes: Add Supermicro
> [PATCH v2 02/10] dt-bindings: arm: npcm: Add nuvoton,wpcm450 compatible string
> [PATCH v2 05/10] ARM: npcm: Introduce Nuvoton WPCM450 SoC
> [PATCH v2 08/10] ARM: dts: Add devicetree for Nuvoton WPCM450 BMC chip
> [PATCH v2 09/10] ARM: dts: Add devicetree for Supermicro X9SCi-LN4F based on WPCM450
> [PATCH v2 10/10] MAINTAINERS: Add entry for Nuvoton WPCM450

Actually for an initial merge, we sometimes just put all the patches into one
branch in the soc tree to avoid conflicts. Unfortunately we already have a
(trivial) conflict now anyway since I merged the irqchip driver for the Apple
M1 SoC through the soc tree but the wpcm irqchip through the irqchip tree.

You did nothing wrong here, this would have just been a way to make the
initial merge a bit easier, and have a tree that is more easily bisectible
when one branch in the merge window contains all the code that is
needed for booting.

        Arnd

  reply	other threads:[~2021-04-09  8:18 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 12:09 [PATCH v2 00/10] Initial support for Nuvoton WPCM450 BMC SoC Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 01/10] dt-bindings: vendor-prefixes: Add Supermicro Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 02/10] dt-bindings: arm: npcm: Add nuvoton, wpcm450 compatible string Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 03/10] dt-bindings: interrupt-controller: Add nuvoton, wpcm450-aic Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 04/10] dt-bindings: watchdog: npcm: Add nuvoton, wpcm450-wdt Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 05/10] ARM: npcm: Introduce Nuvoton WPCM450 SoC Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 06/10] irqchip: Add driver for WPCM450 interrupt controller Jonathan Neuschäfer
2021-04-07 11:11   ` Marc Zyngier
2021-04-07 12:06     ` Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 07/10] watchdog: npcm: Add support for WPCM450 Jonathan Neuschäfer
2021-04-06 13:42   ` Guenter Roeck
2021-04-06 12:09 ` [PATCH v2 08/10] ARM: dts: Add devicetree for Nuvoton WPCM450 BMC chip Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 09/10] ARM: dts: Add devicetree for Supermicro X9SCi-LN4F based on WPCM450 Jonathan Neuschäfer
2021-04-06 12:09 ` [PATCH v2 10/10] MAINTAINERS: Add entry for Nuvoton WPCM450 Jonathan Neuschäfer
2021-04-06 15:15 ` [PATCH v2 00/10] Initial support for Nuvoton WPCM450 BMC SoC Arnd Bergmann
2021-04-06 21:58   ` Jonathan Neuschäfer
2021-04-09  4:37     ` Joel Stanley
2021-04-09  7:57       ` Jonathan Neuschäfer
2021-04-09  8:04         ` Arnd Bergmann [this message]
2021-04-07 12:31 ` Marc Zyngier

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=CAK8P3a18ySEmCzkdD-GmQSPFUza_TK3OBPk0Grbz_aFW72+g7g@mail.gmail.com \
    --to=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=j.neuschaefer@gmx.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=openbmc@lists.ozlabs.org \
    --cc=tmaimon77@gmail.com \
    /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).