From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751032AbdE3WYC (ORCPT ); Tue, 30 May 2017 18:24:02 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:34962 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750821AbdE3WYA (ORCPT ); Tue, 30 May 2017 18:24:00 -0400 Date: Tue, 30 May 2017 17:23:58 -0500 From: Rob Herring To: Linus Walleij Cc: Gregory CLEMENT , Stephen Boyd , Mike Turquette , Alexandre Courbot , "linux-gpio@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , "linux-arm-kernel@lists.infradead.org" , "devicetree@vger.kernel.org" , Russell King , Nadav Haklai , Kostya Porotchkin , Neta Zur Hershkovits , Marcin Wojtas , Omri Itach , Shadi Ammouri Subject: Re: [PATCH 3/6] gpio: dt-bindings: Add documentation for gpio controllers on Armada 7K/8K Message-ID: <20170530222358.abta3srv5emz7wtp@rob-hp-laptop> References: <306395ff39de3d3d3c8f55e5da4de8def29ae8d1.1495210061.git-series.gregory.clement@free-electrons.com> <878tlnzps3.fsf@free-electrons.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 29, 2017 at 10:08:16AM +0200, Linus Walleij wrote: > On Tue, May 23, 2017 at 3:06 PM, Gregory CLEMENT > wrote: > > On mar., mai 23 2017, Linus Walleij 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. > 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