[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <149622742055.34003.14963361587324682626@resonance>
Date: Wed, 31 May 2017 19:43:40 +0900
From: Michael Turquette <mturquette@...libre.com>
To: Rob Herring <robh@...nel.org>,
"Linus Walleij" <linus.walleij@...aro.org>
Cc: "Gregory CLEMENT" <gregory.clement@...e-electrons.com>,
"Stephen Boyd" <sboyd@...eaurora.org>,
"Alexandre Courbot" <gnurou@...il.com>,
"linux-gpio@...r.kernel.org" <linux-gpio@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"Jason Cooper" <jason@...edaemon.net>,
"Andrew Lunn" <andrew@...n.ch>,
"Sebastian Hesselbarth" <sebastian.hesselbarth@...il.com>,
"Thomas Petazzoni" <thomas.petazzoni@...e-electrons.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
"Russell King" <rmk+kernel@...linux.org.uk>,
"Nadav Haklai" <nadavh@...vell.com>,
"Kostya Porotchkin" <kostap@...vell.com>,
"Neta Zur Hershkovits" <neta@...vell.com>,
"Marcin Wojtas" <mw@...ihalf.com>,
"Omri Itach" <omrii@...vell.com>,
"Shadi Ammouri" <shadi@...vell.com>
Subject: Re: [PATCH 3/6] gpio: dt-bindings: Add documentation for gpio controllers on
Armada 7K/8K
Quoting Rob Herring (2017-05-31 07:23:58)
> On Mon, May 29, 2017 at 10:08:16AM +0200, Linus Walleij wrote:
> > On Tue, May 23, 2017 at 3:06 PM, Gregory CLEMENT
> > <gregory.clement@...e-electrons.com> wrote:
> > > On mar., mai 23 2017, Linus Walleij <linus.walleij@...aro.org> wrote:
> >
> > >> Please rebase and resend the rest of the patches.
> > >
> > > Actually I was wrong with my assumption that there was no dependency.
> > > For the binding documentation there is dependecy accross the series I
> > > sent.
> > >
> > > This patch depends on "pinctrl: dt-bindings: add documentation for AP806
> > > pin controllers" [1] and "pinctrl: dt-bindings: add documentation for
> > > CP110 pin controllers" [3] from the series "Add support for the pin
> > > controllers on the Marvell Armada 7K/8K".
> > >
> > > As you are maintainer of both gpio and pinctrl subsystem it will be easy
> > > to resolv.
> >
> > Please send all patches in one big series in that case, so I can apply
> > them all to a branch and merge that branch into both trees.
> >
> > > But these last patches depend also on "clk: mvebu: ap806: introduce a
> > > new binding" [3] in the clock series "Improve ap806 clk support on
> > > Marvell Armada 7K/8K" and on "clk: mvebu: cp110: introduce a new
> > > binding" [4] in the clock series "Improve cp110 clk support on Marvell
> > > Armada 7K/8K".
> >
> > That sounds messy.
> >
> > > So for these particular patches, either I rebase them on the v4.12-rc2
> > > and there will be a small merge conflict during the merge window for
> > > v4.13, or we can ask a stable branch with only these few patches (I am
> > > adding the clock maintainer to this email).
> > >
> > > If we chose this last option I can split the clock patches to have patch
> > > modifying only the binding documentation.
> >
> > I think you can make a patch just modifying the binding documentation
> > and then apply that patch to *both* trees, just make sure the patch
> > is *final* and not applied in different versions in clk and pinctrl.
>
> I thought we try to avoid doing that.
>
> > I think cross-tree branches for documentation clashes is too much
> > bureaucracy.
>
> I can just take all the doc patches separately. Or you can take the
> clock one too.
Stephen and I have started making a -dt branch for each new clk driver
which. This stable branch has only the dt bindings/headers in it (no
driver code).
I'll make such a branch for ap806 this week and everyone can merge that
in as a dep.
Regards,
Mike
>
> > Make sure your clock patch is finalized and preferably also applied
> > to the clk tree then put it in the bottom of the patch set you send
> > to me as well and I will proceed like above.
> >
> > Yours,
> > Linus Walleij
Powered by blists - more mailing lists