From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] mach-ep93xx: break out GPIO driver specifics
Date: Sat, 1 Oct 2011 23:39:14 +0100 [thread overview]
Message-ID: <20111001223914.GP11710@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <CACRpkdazjpKZRfpoYgZ=kC+auEj9q-KMHa6qsWsD+5Hpji+96w@mail.gmail.com>
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@secretlab.ca> 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:
#include <linux/module.h>
#include <mach/hardware.h>
whereas I have this around line 24:
#include <linux/basic_mmio_gpio.h>
#include <mach/hardware.h>
So I've applied this with GNU patch instead, accepting the one line of
fuzz:
Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines).
As a result, I expect sfr will report a trivial merge conflict here.
WARNING: multiple messages have this Message-ID (diff)
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>,
Linus Walleij <linus.walleij@stericsson.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Lee Jones <lee.jones@linaro.org>,
Hartley Sweeten <hsweeten@visionengravers.com>,
Ryan Mallon <rmallon@gmail.com>
Subject: Re: [PATCH v2] mach-ep93xx: break out GPIO driver specifics
Date: Sat, 1 Oct 2011 23:39:14 +0100 [thread overview]
Message-ID: <20111001223914.GP11710@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <CACRpkdazjpKZRfpoYgZ=kC+auEj9q-KMHa6qsWsD+5Hpji+96w@mail.gmail.com>
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@secretlab.ca> 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:
#include <linux/module.h>
#include <mach/hardware.h>
whereas I have this around line 24:
#include <linux/basic_mmio_gpio.h>
#include <mach/hardware.h>
So I've applied this with GNU patch instead, accepting the one line of
fuzz:
Hunk #1 succeeded at 23 with fuzz 1 (offset -1 lines).
As a result, I expect sfr will report a trivial merge conflict here.
next prev parent reply other threads:[~2011-10-01 22:39 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 8:42 [PATCH v2] mach-ep93xx: break out GPIO driver specifics Linus Walleij
2011-09-20 8:42 ` Linus Walleij
2011-09-20 17:40 ` Grant Likely
2011-09-20 17:40 ` Grant Likely
2011-09-20 20:32 ` Linus Walleij
2011-09-20 20:32 ` Linus Walleij
2011-10-01 22:39 ` Russell King - ARM Linux [this message]
2011-10-01 22:39 ` Russell King - ARM Linux
2011-10-02 21:15 ` Linus Walleij
2011-10-02 21:15 ` Linus Walleij
2011-09-20 17:43 ` H Hartley Sweeten
2011-09-20 17:43 ` H Hartley Sweeten
2011-10-15 18:18 ` Mika Westerberg
2011-10-15 18:18 ` Mika Westerberg
2011-10-15 20:41 ` Russell King - ARM Linux
2011-10-15 20:41 ` Russell King - ARM Linux
2011-10-16 7:39 ` Mika Westerberg
2011-10-16 7:39 ` Mika Westerberg
2011-10-16 10:57 ` Linus Walleij
2011-10-16 10:57 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111001223914.GP11710@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.