From: Andrew Morton <akpm@linux-foundation.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
LKML <linux-kernel@vger.kernel.org>,
john stultz <johnstul@us.ibm.com>
Subject: Re: [PATCH] timekeeping fix mismerge
Date: Mon, 14 May 2007 13:33:33 -0700 [thread overview]
Message-ID: <20070514133333.3154d08d.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.0.98.0705141218390.6739@woody.linux-foundation.org>
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.
prev parent reply other threads:[~2007-05-14 20:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-14 9:10 [PATCH] timekeeping fix mismerge Thomas Gleixner
2007-05-14 18:58 ` Andrew Morton
2007-05-14 19:17 ` Thomas Gleixner
2007-05-14 19:25 ` Linus Torvalds
2007-05-14 20:33 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070514133333.3154d08d.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=johnstul@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.