On 06/13/2010 03:13 PM, Gene Heskett wrote:

quoted text
> Unfortunately, this patch will not apply to my src tree for 2.6.35-rc3,
> even after I fixed the unwanted line wrap in the first active line.
>
> I get:
>
> [root@coyote linux-2.6.35-rc3]# patch -p1<../2.6.35-rc3-test.patch
> patching file net/core/skbuff.c
> Hunk #1 FAILED at 532.
> 1 out of 1 hunk FAILED -- saving rejects to file net/core/skbuff.c.rej
>
> Did my grabbing it with swiftfox damage it even further?
> ------------------------------------------------------------------
> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
> index 9f07e74..bcf2fa3 100644
> --- a/net/core/skbuff.c
> +++ b/net/core/skbuff.c
> @@ -532,6 +532,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
>    	new-&gt;ip_summed		= old-&gt;ip_summed;

I don't know what caused the corruption, but it's a systematic error.
Throughout the patch, the dereference symbol -> has been changed to
-& so it's not surprising that the patch won't apply.  I've never seen
that particular problem before.

I don't think the line numbers (e.g.532) are responsible.

--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/