Re: [PATCH] timekeeping fix mismerge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 14 May 2007 12:25:02 -0700 (PDT)
Linus Torvalds <[email protected]> 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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux