RE: [PATCH] amso1100/c2_provider.c: use %pM to shown MAC address

[H Hartley Sweeten]

On Wednesday, December 30, 2009 10:59 PM, David Miller wrote:
> From: "H Hartley Sweeten" <hartleys@xxxxxxxxxxxxxxxxxxx>
> Date: Tue, 29 Dec 2009 11:22:42 -0500
>
>> Use the %pM kernel extension to display the MAC address.
>> 
>> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
>
> Hartley, I was going to mention this for your previous
> series, and now that you've sent another huge set of
> patches I must make a note of this.
>
> Every single one of your patches applies with one-line of
> patch 'fuzz', like this:
>
> davem@sunset:~/src/GIT/linux-2.6$ patch -p1 <diff
> patching file drivers/infiniband/hw/amso1100/c2_provider.c
> Hunk #1 succeeded at 760 with fuzz 1.
>
> And GIT rejects such patches entirely:
>
> davem@sunset:~/src/GIT/linux-2.6$ git apply --check --whitespace=error-all diff
> error: patch failed: drivers/infiniband/hw/amso1100/c2_provider.c:760
> error: drivers/infiniband/hw/amso1100/c2_provider.c: patch does not apply
>
> So I had to add all of your patches to my tree by hand, one by one,
> yesterday.
>
> I refuse to do this for so many more patches.  Could you generate
> patches that apply accurately?

Hi David,

Sorry for the problem with the patches.  I really don't understand why they are
producing a 'fuzz' issue.  I'm still a bit new with git, maybe you can provide
me a bit of insight?

To create all of the patches I did the following:

1) 'git pull' of Linus' tree to make sure I had the most recent source.
2) opened the file I want to patch, i.e .../c2_provider.c
3) made the edit and saved the file
4) 'git diff > ~/patches/c2_provider_MAC.patch'
5) restored the original file
6) verified the patch applies
bigguiness@etch ~/src/git/linux-2.6 $ patch -p1 < ~/patches/c2_provider_MAC.patch 
patching file drivers/infiniband/hw/amso1100/c2_provider.c

I have never tried the 'git apply ...' before so I just did with this patch:

bigguiness@etch ~/src/git/linux-2.6 $ git apply --check --whitespace=error-all /mnt/hgfs/share/c2_provider_MAC.patch
bigguiness@etch ~/src/git/linux-2.6 $ 

I assume no messages means that the patch applies ok?

I have attached the original patch that I sent in the email.  Could you
please see if you still have problems with it?  If you don't it might be
something in my email configuration.

Thanks and sorry for the troubles,
Hartley

Attachment: c2_provider_MAC.patch
Description: c2_provider_MAC.patch