From: Mark Brown <broonie@kernel.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
DTML <devicetree@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Linus Walleij <linusw@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Kevin Hilman <khilman@baylibre.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Tony Lindgren <tony@atomide.com>, Shawn Guo <shawnguo@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
SoC Team <soc@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>,
Gregory Clement <gregory.clement@bootlin.com>,
Florian Fainelli <f.fainelli@gmail.com>
Subject: Re: New 'make dtbs_check W=1' warnings
Date: Tue, 13 Apr 2021 10:55:22 +0100 [thread overview]
Message-ID: <20210413095522.GA5586@sirena.org.uk> (raw)
In-Reply-To: <CAK8P3a1_YB944niA-ebk-nJx-JDBh1q7z6s-9mLGFjF2Nv9r9w@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
On Mon, Apr 12, 2021 at 08:52:37PM +0200, Arnd Bergmann wrote:
> On Mon, Apr 12, 2021 at 6:01 PM Bjorn Andersson
> > On Mon 12 Apr 08:14 CDT 2021, Arnd Bergmann wrote:
> > So the same binding patch is picked up both in the driver and soc tree?
> > I was expecting that to cause (harmless) conflicts when things arrive in
> > Linus' merge queue?
> > Or are you saying people go the length to create immutable branches for
> > each binding?
> I think it's usually one immutable branch for all the bindings of a given
> merge window. This avoids the merge conflicts, and you can add further
> bindings on the same branch before sending it off to the soc tree.
Even with a single branch for everything having to split serieses into
multiple branches seems like a pain, it'll break my automation for
example.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
DTML <devicetree@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Linus Walleij <linusw@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Kevin Hilman <khilman@baylibre.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Tony Lindgren <tony@atomide.com>, Shawn Guo <shawnguo@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
SoC Team <soc@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>,
Gregory Clement <gregory.clement@bootlin.com>,
Florian Fainelli <f.fainelli@gmail.com>
Subject: Re: New 'make dtbs_check W=1' warnings
Date: Tue, 13 Apr 2021 10:55:22 +0100 [thread overview]
Message-ID: <20210413095522.GA5586@sirena.org.uk> (raw)
Message-ID: <20210413095522.zfBatjKKZI6XOJgMtAFniw7ncnnwjF_LDQmDqRnFHpM@z> (raw)
In-Reply-To: <CAK8P3a1_YB944niA-ebk-nJx-JDBh1q7z6s-9mLGFjF2Nv9r9w@mail.gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 808 bytes --]
On Mon, Apr 12, 2021 at 08:52:37PM +0200, Arnd Bergmann wrote:
> On Mon, Apr 12, 2021 at 6:01 PM Bjorn Andersson
> > On Mon 12 Apr 08:14 CDT 2021, Arnd Bergmann wrote:
> > So the same binding patch is picked up both in the driver and soc tree?
> > I was expecting that to cause (harmless) conflicts when things arrive in
> > Linus' merge queue?
> > Or are you saying people go the length to create immutable branches for
> > each binding?
> I think it's usually one immutable branch for all the bindings of a given
> merge window. This avoids the merge conflicts, and you can add further
> bindings on the same branch before sending it off to the soc tree.
Even with a single branch for everything having to split serieses into
multiple branches seems like a pain, it'll break my automation for
example.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-13 9:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 15:08 New 'make dtbs_check W=1' warnings Arnd Bergmann
2021-04-08 15:08 ` Arnd Bergmann
2021-04-08 15:25 ` Alexandre Belloni
2021-04-08 15:25 ` Alexandre Belloni
2021-04-08 23:59 ` Rob Herring
2021-04-08 23:59 ` Rob Herring
2021-04-08 19:25 ` Krzysztof Kozlowski
2021-04-08 19:25 ` Krzysztof Kozlowski
2021-04-08 22:11 ` Linus Walleij
2021-04-08 22:11 ` Linus Walleij
2021-04-08 22:11 ` Linus Walleij
2021-04-09 3:37 ` Florian Fainelli
2021-04-09 3:37 ` Florian Fainelli
2021-04-09 5:27 ` Rafał Miłecki
2021-04-09 5:27 ` Rafał Miłecki
2021-04-12 11:32 ` Geert Uytterhoeven
2021-04-12 11:32 ` Geert Uytterhoeven
2021-04-12 11:32 ` Geert Uytterhoeven
2021-04-12 13:14 ` Arnd Bergmann
2021-04-12 13:14 ` Arnd Bergmann
2021-04-12 16:01 ` Bjorn Andersson
2021-04-12 16:01 ` Bjorn Andersson
2021-04-12 18:52 ` Arnd Bergmann
2021-04-12 18:52 ` Arnd Bergmann
2021-04-13 2:36 ` Bjorn Andersson
2021-04-13 2:36 ` Bjorn Andersson
2021-04-13 9:55 ` Mark Brown [this message]
2021-04-13 9:55 ` Mark Brown
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=20210413095522.GA5586@sirena.org.uk \
--to=broonie@kernel.org \
--cc=alexandre.belloni@bootlin.com \
--cc=alexandre.torgue@st.com \
--cc=arnd@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gregory.clement@bootlin.com \
--cc=khilman@baylibre.com \
--cc=kristo@kernel.org \
--cc=krzk@kernel.org \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=shawnguo@kernel.org \
--cc=soc@kernel.org \
--cc=tony@atomide.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