From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 05/10] PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
Date: Mon, 5 Oct 2009 00:14:02 +0100 [thread overview]
Message-ID: <20091004231402.GA31087@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <4AC92954.1010104@lwfinger.net>
On Sun, Oct 04, 2009 at 06:01:40PM -0500, Larry Finger wrote:
> Russell King wrote:
> > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > ---
> > drivers/pcmcia/pxa2xx_base.c | 19 +++++++----
> > drivers/pcmcia/pxa2xx_base.h | 3 ++
> > drivers/pcmcia/pxa2xx_lubbock.c | 10 ++++--
> > drivers/pcmcia/sa1100_badge4.c | 7 ++++-
> > drivers/pcmcia/sa1100_jornada720.c | 20 ++++++++----
> > drivers/pcmcia/sa1100_neponset.c | 9 ++++-
> > drivers/pcmcia/sa1111_generic.c | 58 ++++++++++++++++++++++++++++--------
> > drivers/pcmcia/sa1111_generic.h | 14 ++++++++
> > drivers/pcmcia/sa11xx_base.c | 21 ++++++++----
> > drivers/pcmcia/sa11xx_base.h | 2 +
> > 10 files changed, 123 insertions(+), 40 deletions(-)
>
> What tree is this patch for? I get the following errors when applying
> to taday's pull of Linus's tree (git describe is
> v2.6.32-rc1-384-ga99bbaf):
>
> patching file drivers/pcmcia/sa1100_jornada720.c
> Hunk #1 FAILED at 24.
> Hunk #2 FAILED at 40.
> Hunk #3 FAILED at 85.
> Hunk #4 FAILED at 101.
> 4 out of 4 hunks FAILED -- rejects in file
> drivers/pcmcia/sa1100_jornada720.c
Guess that's because 5690/1 was been applied behind my back. I'll see
about rebasing the patch and discarding 5690 from the patch system.
next prev parent reply other threads:[~2009-10-04 23:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-04 15:08 [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module Russell King
2009-10-04 15:08 ` [RFC PATCH 02/10] PCMCIA: soc_common: provide single socket add/remove functionality Russell King
2009-10-04 15:09 ` [RFC PATCH 03/10] PCMCIA: soc_common: push socket removal down to SoC specific support Russell King
2009-10-04 15:09 ` [RFC PATCH 04/10] PCMCIA: soc_common: push socket probe down into " Russell King
2009-10-04 15:09 ` [RFC PATCH 05/10] PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data Russell King
2009-10-04 23:01 ` Larry Finger
2009-10-04 23:14 ` Russell King - ARM Linux [this message]
2009-10-05 9:21 ` Kristoffer Ericson
2009-10-06 10:45 ` Russell King - ARM Linux
2009-10-07 16:48 ` Larry Finger
2009-10-07 18:26 ` Russell King - ARM Linux
2009-10-07 18:45 ` Larry Finger
2009-10-04 15:09 ` [RFC PATCH 06/10] PCMCIA: sa1111: remove duplicated initializers Russell King
2009-10-04 15:09 ` [RFC PATCH 07/10] PCMCIA: soc_common: constify soc_pcmcia_socket ops member Russell King
2009-10-04 15:09 ` [RFC PATCH 08/10] PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket Russell King
2009-10-04 15:09 ` [RFC PATCH 09/10] PCMCIA: ss: allow PCI IRQs > 255 Russell King
2009-10-04 15:09 ` [RFC PATCH 10/10] PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket Russell King
-- strict thread matches above, loose matches on Subject: below --
2009-10-27 23:11 [RFC PATCH 01/10] PCMCIA: soc_common: convert to a stand alone module Russell King - ARM Linux
2009-10-27 23:12 ` [RFC PATCH 05/10] PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data Russell King - ARM Linux
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=20091004231402.GA31087@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).