Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbaBYPRe (ORCPT ); Tue, 25 Feb 2014 10:17:34 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:63045 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752617AbaBYPRc (ORCPT ); Tue, 25 Feb 2014 10:17:32 -0500 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 108.39.110.144 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+Q1+qrZyKH9mzeZbwmWlLF6/F4Xz3k5NY= X-DKIM: OpenDKIM Filter v2.0.1 titan 66A2853368D Date: Tue, 25 Feb 2014 10:16:56 -0500 From: Jason Cooper To: 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" Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from Dove pinctrl Message-ID: <20140225151656.GI1010@titan.lakedaemon.net> References: <1393231382-11078-1-git-send-email-sebastian.hesselbarth@gmail.com> <20140224181023.GA1010@titan.lakedaemon.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: > > > Sebastian, Linus, > > > > 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? thx, Jason. -- 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/