[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH] staging: brcm80211: SDIO/MMC cleanups
From:       "Arend van Spriel" <arend () broadcom ! com>
Date:       2011-05-06 8:25:42
Message-ID: 4DC3B086.90802 () broadcom ! com
[Download RAW message or body]

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?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]