[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091029.212142.189578068.davem@davemloft.net>
Date: Thu, 29 Oct 2009 21:21:42 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: Sandeep.Kumar@...escale.com
Cc: netdev@...r.kernel.org, afleming@...escale.com
Subject: Re: [PATCH v3 4/7] fsl_pq_mdio: Add Suport for etsec2.0 devices.
From: Sandeep Gopalpet <Sandeep.Kumar@...escale.com>
Date: Thu, 29 Oct 2009 19:53:49 +0530
> From: Sandeep Gopalpet <sandeep.kumar@...escale.com>
>
> This patch adds mdio support for etsec2.0 devices.
>
> Modified the fsl_pq_mdio structure to include the new mdio
> members.
>
> Signed-off-by: Sandeep Gopalpet <sandeep.kumar@...escale.com>
> ---
> *. Rebased to the net-next-2.6 tree as of 20091028 cloned from
> http://www.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
It does not apply, again.
And again, here is the bundle I tried to apply using "git am --signoff":
http://vger.kernel.org/~davem/bundle-641.mbox
--------------------
davem@...set:~/src/GIT/net-next-2.6$ git am --signoff bundle-641.mbox
Applying: gianfar: Add per queue structure support
Applying: gianfar: Introduce logical group support.
Applying: gianfar: Add Multiple Queue Support
Applying: fsl_pq_mdio: Add Suport for etsec2.0 devices.
error: patch failed: drivers/net/fsl_pq_mdio.c:405
error: drivers/net/fsl_pq_mdio.c: patch does not apply
Patch failed at 0004 fsl_pq_mdio: Add Suport for etsec2.0 devices.
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".
--------------------
Did you try the bundle I posted yesterday which failed? This
one is identical, you didn't change anything.
This is getting rediculious.
Try again, and when you do take the patches from patchwork at:
http://patchwork.ozlabs.org/project/netdev/list/
and you try to apply them to net-next-2.6 using git (_not_ 'patch',
'patch' is way too lenient about fuzz and line offsets) so that you
can see what's happening.
I'm completely ignoring your patch postings until you sort this out.
You cannot have line offsets or fuzz when you send patches that are to
be applied by GIT, and that is the problem with patch #4:
davem@...set:~/src/GIT/net-next-2.6$ patch -p1 <diff
patching file drivers/net/fsl_pq_mdio.c
Hunk #6 succeeded at 436 with fuzz 1.
patching file drivers/net/fsl_pq_mdio.h
GIT does not allow line fuzz, you must make absolutely pristine
patches, and therefore if you are testing your submission with just
'patch' that absolutely will not work.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists