lkml.org 
[lkml]   [2007]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] timekeeping fix mismerge
On Mon, 14 May 2007 12:25:02 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> I don't think re-generating the diff is wrong, and in fact I think you
> have to do it, but I think Andrew should use "--fuzz=0" or at least
> "--fuzz=1" instead of the default 2. Yeah, it obviously causes more patch
> application failures, and it can be very irritating if *most* of those
> patches would have applied cleanly and correctly with --fuzz=2, but
> --fuzz=2 really is very dangerous. It literally just needed two lines to
> match in the wrong place (and as mentioned, those two lines can be
> trivial, like in the example - totally empty, even!)

Yeah I played with that a while back and --fuzz=0 just broken everything.

--fuzz=1 seems acceptable though. I'll use that from now on.

-
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/

\
 
 \ /
  Last update: 2007-05-14 22:37    [W:1.021 / U:0.300 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site