Re: [PATCH v2] mach-ep93xx: break out GPIO driver specifics
From: Russell King - ARM Linux
Date: Sat Oct 01 2011 - 18:39:35 EST
On Tue, Sep 20, 2011 at 10:32:13PM +0200, Linus Walleij wrote:
> On Tue, Sep 20, 2011 at 7:40 PM, Grant Likely <grant.likely@xxxxxxxxxxxx> wrote:
> > Which tree will this go through? I don't think it should go via the
> > gpio tree since it is mostly within arch/arm.
> It'd dependent on Russells cleanups so it'll go through Russells
> tree and his gpio cleanup branch there.
It's dependent on other stuff elsewhere too:
error: patch failed: drivers/gpio/gpio-ep93xx.c:24
error: drivers/gpio/gpio-ep93xx.c: patch does not apply
According to your patch, line 24 onwards is:
whereas I have this around line 24:
So I've applied this with GNU patch instead, accepting the one line of
Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines).
As a result, I expect sfr will report a trivial merge conflict here.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/