Re: Announce: Linux-next (Or Andrew's dream :-))

Thomas Gleixner
2008-02-16T11:17:40Z

On Wed, 13 Feb 2008, Geert Uytterhoeven wrote:
> On Tue, 12 Feb 2008, Greg KH wrote:
> > On Tue, Feb 12, 2008 at 04:49:46PM -0800, Linus Torvalds wrote:
> > > On Tue, 12 Feb 2008, Greg KH wrote:
> > > > Perhaps you need to switch to using quilt. This is the main reason why
> > > > I use it.
> > >
> > > Btw, on that note: if some quilt user can send an "annotated history file"
> > > of their quilt usage, it's something that git really can do, and I'll see
> > > if I can merge (or rather, coax Junio to merge) the relevant part of stgit
> > > to make it possible to just basically get "quilt behaviour" for the parts
> > > of a git tree that you haven't pushed out yet.
> >
> > Ted's description matches mine (keep quilt tree in git, edit changelog
> > entries, rebase on newer kernel versions, etc.) I can go into details
> > if needed.
>
> Ack. Same for PS3 and m68k (except I don't have the m68k patches in git (yet)).
>
> Two issues with using quilt:
> 1. Sometimes a patch still applies after it was integrated upstream,

Add QUILT_PATCH_OPTS="--fuzz=0" to your ~/.quiltrc file.

The default is fuzz=2 IIRC which tries to be too clever. I set fuzz
to 0 after I got burned by an unnoticed "quilt patched it somewhere
else" bug, which took me half a day to figure out.

Thanks,

tglx