On Tuesday 20 March 2007, Michael Krufky wrote: >Gene Heskett wrote: >> On Tuesday 20 March 2007, Greg KH wrote: >>> On Tue, Mar 20, 2007 at 01:15:02AM -0400, Gene Heskett wrote: >>>> In any event, something tickled the monster, and its hungry. This >>>> is a full-stop, show-stopper AFAIAC. >>>> >>>> I'll cut that patch-2.6.20.4-rc1 in halves, and build 2 more test >>>> kernels tomorrow to start a bisect if no one has any better idea >>>> before then. >>> >>> I'd recommend using the quilt tree of patches to do this, it will be >>> easier than trying to split the larger patch up into pieces by hand. >>> >>> thanks, >>> >>> greg k-h >> >> I don't have quilt installed, and no idea how to use it if it was, >> Greg. Even my git is now pushing a year old. > >Gene- > >quilt is a very easy tool to use... Here is a quick run-down. > >#1) remove the stable -rc patch from the tree > >#2) install quilt > >#3) go to your source tree, and create a directory called "patches" > >#4) copy all of the patches from Greg's queue into that "patches" > directory, including the "series" file.
I hope by Greg's queue you meant: <ftp:ftp.kernel.org:/pub/linux/kernel/people/gregkh/gregkh-2.6/patches> As that's the tree I just pulled in and put in /usr/src/patches with gftp. >#5) quilt push, to apply the first patch > quilt push, to apply the second patch (you get the idea) > quilt push -a , to apply all patches in the series >#6) quilt pop, to back out the most recent patch pushed in > quilt pop -a to back out the entire series. > >If a patch doesnt apply, quilt will let you know about it, and present > you with the option to force the patch to apply. This is highly > unlikely to occur, since Greg has already done what needs to be done to > make these patches apply to the source. > >For a better explanation, see "man quilt". Using quilt, when you have a > list of patches and a series file containing the merge order is *much* > easier that a git bisection, and can help you to find the problem patch > much quicker. > >I hope this helps... I do too, but I'm now less than 2 hours from the backup run, which with this currently running kernel, should be a sane one. ? Since this will start with a patch level of a 2.6.20.3 kernel (or is that patch level a mistaken assumption on my part, but I haven't reversed the 2.6.20.4-rc1 patch yet, that's next.), and I have to edit both the Makefile and my 'makeit' script so the names all match, what makes a good naming convention while I'm doing this? This might all be clear once I read the quilt manpage, which I haven't had a chance to do yet. That is next, after I reverse that patch. >Good Luck, > >Michael Krufky -- Cheers, Gene "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) The chief cause of problems is solutions. -- Eric Sevareid - 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/