[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140225151656.GI1010@titan.lakedaemon.net>
Date: Tue, 25 Feb 2014 10:16:56 -0500
From: Jason Cooper <jason@...edaemon.net>
To: Linus Walleij <linus.walleij@...aro.org>,
Sebastian Hesselbarth <sebastian.hesselbarth@...glemail.com>
Cc: Mark Rutland <mark.rutland@....com>, Andrew Lunn <andrew@...n.ch>,
Russell King <linux@....linux.org.uk>,
Pawel Moll <pawel.moll@....com>,
Ian Campbell <ijc+devicetree@...lion.org.uk>,
"linux-doc@...r.kernel.org" <linux-doc@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
Rob Herring <robh+dt@...nel.org>,
Rob Landley <rob@...dley.net>,
Kumar Gala <galak@...eaurora.org>,
Gregory Clement <gregory.clement@...e-electrons.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>
Subject: Re: [PATCH 00/10] pinctrl: mvebu: remove hard-coded addresses from
Dove pinctrl
On Tue, Feb 25, 2014 at 10:36:54AM +0100, Linus Walleij wrote:
> On Mon, Feb 24, 2014 at 7:10 PM, Jason Cooper <jason@...edaemon.net> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists