Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753323AbaBYPa5 (ORCPT ); Tue, 25 Feb 2014 10:30:57 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:41128 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752683AbaBYPaz (ORCPT ); Tue, 25 Feb 2014 10:30:55 -0500 Message-ID: <530CB725.5070904@gmail.com> Date: Tue, 25 Feb 2014 16:30:45 +0100 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 To: Jason Cooper , Linus Walleij , Sebastian Hesselbarth CC: Mark Rutland , Andrew Lunn , Russell King , Pawel Moll , Ian Campbell , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Rob Herring , Rob Landley , Kumar Gala , Gregory Clement , "linux-arm-kernel@lists.infradead.org" , Thomas Petazzoni Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl References: <1393231382-11078-1-git-send-email-sebastian.hesselbarth@gmail.com> <20140224181023.GA1010@titan.lakedaemon.net> <20140225151656.GI1010@titan.lakedaemon.net> In-Reply-To: <20140225151656.GI1010@titan.lakedaemon.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/25/14 16:16, Jason Cooper wrote: > On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote: >> On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper wrote: >>> I've now created mvebu/pinctrl-dove for this series. It's based on >>> v3.14-rc1, and depends on mvebu/pinctrl (which depends on >>> mvebu/pinctrl-3xx). >>> >>> I've kept this series in a separate branch in case we encounter an >>> unforeseen problem with something in here. Then this branch can be >>> dropped, and /pinctrl-3xx and /pinctrl will still make it in. >>> >>> So, all patches except 3 and 4 are in mvebu/pinctrl-dove. 3 and 4 are >>> in mvebu/dt. >> >> OK so what should I be pulling in first now? > > Of course I woke up this morning not happy with this :-/ Here's what it > looks like currently: > > /v3.14-rc1 > | > --+---+---+---+---+ mvebu/pinctrl-3xx > | \ > |---+---+---+---+---+---+---+ mvebu/pinctrl > \ \ > \---------------------------+---+---+---+ mvebu/pinctrl-dove > > Not to scale. > > > I would prefer to do: > > /v3.14-rc1 > | > --+---+---+---+---+ mvebu/pinctrl-cleanup > | \ > |----------------+--+---+---+ mvebu/pinctrl-3xx > \ \ > \----------------+---+---+--+---+---+---+ mvebu/pinctrl-dove > > But this would mean moving some patches to branches other than what they > were sent with. The advantage is that /pinctrl-3xx and /pinctrl-dove > don't depend on each other, and only depend on -cleanup. Which is great > if there is something wrong in either branch. > > Sebastian, I can cherry-pick the patches around, but you know the code > better than any of us, do you foresee any problems with this scenario? If Thomas agrees, I can rework Armada 375/38x pinctrl stubs to fit on mvebu/pinctrl. That should allow you to have mvebu/pinctrl-dove independent of mvebu/pinctrl-3xx. Not a big deal, I'd just pick 375/38x patches from mvebu/pinctrl and squash them into mvebu/pinctrl-3xx. The only "issue" is that DT documentation update patches from mvebu/pinctrl-dove have to be split too. I'll prepare the three new branches for you and Thomas to look at today. Sebastian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/