Hi Michael, On mer., mai 31 2017, Michael Turquette <mturquette@xxxxxxxxxxxx> wrote: > 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@xxxxxxxxxxxxxxxxxx> wrote: >> > > On mar., mai 23 2017, Linus Walleij <linus.walleij@xxxxxxxxxx> 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. So please use the version 2 I've just submitted. I split each patch to allow you to have a dt binding only branch. See http://lists.infradead.org/pipermail/linux-arm-kernel/2017-May/509832.html I did the same for the cp110: http://lists.infradead.org/pipermail/linux-arm-kernel/2017-May/509816.html Gregory > > 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 -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
