From: "Arend van Spriel" <arend@broadcom.com>
To: "Grant@google.com" <Grant@google.com>,
"\"Grundler <grundler\"@chromium.org <Grundler"
<grundler@chromium.org>
Cc: "Grant Grundler" <grundler@chromium.org>,
"Greg Kroah-Hartman" <greg@kroah.com>,
"devel@linuxdriverproject.org" <devel@linuxdriverproject.org>,
"Dowan Kim" <dowan@broadcom.com>,
"Henry Ptasinski" <henryp@broadcom.com>,
"Venkat Rao" <vrao@broadcom.com>,
git@vger.kernel.org
Subject: Re: [PATCH] staging: brcm80211: SDIO/MMC cleanups
Date: Fri, 6 May 2011 10:25:42 +0200 [thread overview]
Message-ID: <4DC3B086.90802@broadcom.com> (raw)
In-Reply-To: <20110504165947.40EED208186@grundler.mtv.corp.google.com>
On 05/04/2011 06:59 PM, Grant Grundler wrote:
> misc coding style cleanups to dhd_sdio/sdmmc
>
> o replace PKTFREE2 macro with static dhdsdio_pktfree2()
> o drop "delta" local var
> o drop GSPI_PR55150_BAILOUT
> o reformat some of the comments (white space changes)
> o drop dhd_bcmsdh_recv_buf wrapper and directly call bcmsdh_recv_buf
>
> Signed-off-by: Grant Grundler<grundler@chromium.org>
>
> ---
>
> diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
> index 0c248aa..4bfd8d8 100644
I am having difficulties applying a patch and want to turn it into a
learning experience for me. I tried to apply this patch using the
following steps:
1. save the email to grundler.eml
2. checkout staging-next branch (HEAD 7cc8243)
3. run 'git am grundler.eml'
Applying: staging: brcm80211: SDIO/MMC cleanups
error: patch failed: drivers/staging/brcm80211/brcmfmac/dhd_sdio.c:135
error: drivers/staging/brcm80211/brcmfmac/dhd_sdio.c: patch does not apply
Patch failed at 0001 staging: brcm80211: SDIO/MMC cleanups
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
The git documentation on the git am command is not very elaborate. I
investigated the issue and checked following:
1. line 135 in dhd_sdio.c in the patch does match line 135 in my checked
out branch.
2. did 'git hash-object'
$ git hash-object drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
0c248aa43a37cfd1701f97988ec7cf4ff76a2789
What could be the problem?
next parent reply other threads:[~2011-05-06 8:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110504165947.40EED208186@grundler.mtv.corp.google.com>
2011-05-06 8:25 ` Arend van Spriel [this message]
2011-05-06 14:37 ` [PATCH] staging: brcm80211: SDIO/MMC cleanups Junio C Hamano
2011-05-06 16:00 ` Michael J Gruber
2011-05-06 16:07 ` Junio C Hamano
2011-05-06 16:44 ` Arend van Spriel
2011-05-06 15:21 ` Grant Grundler
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=4DC3B086.90802@broadcom.com \
--to=arend@broadcom.com \
--cc=Grant@google.com \
--cc=devel@linuxdriverproject.org \
--cc=dowan@broadcom.com \
--cc=git@vger.kernel.org \
--cc=greg@kroah.com \
--cc=grundler@chromium.org \
--cc=henryp@broadcom.com \
--cc=vrao@broadcom.com \
/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).