I'm using 2.5.70-mm4 to try out some things, but I realize, as mm8 comes out, that my changes are
against a kernel that will soon be old.
I know that some people work against the current development kernel (see quoted article from linux-mm below), but since I am not using bitkeeper, I don't know the best way to easily move my changes to newer kernels. (I use cvs, patch, and diff.)
How do other people do this? Like this ... ?
kernel$ cp 2.5.70-mm4-elc/.config 2.5.70-mm8 kernel$ diff -urN --exclude CVS \ 2.5.70-mm4 2.5.70-mm4-elc > elc.diff kernel$ cd 2.5.70-mm8 && patch -p1 < ../elc.diff
patchutils is something I find very useful. Also, patch is smart enought to ignore "junk" at the beginning of a patch, so I make my patches like this:
# name-of-patch # # Commentary about what the patch does # # output from diffstat of this patch patch -p1 -i "$0"; exit $? contents of diff here
The reason I do it this way is it gives me comentary on what the patch is for; and I can apply the patch by running it as a shell script. I don't usually do that, but sometimes it is useful if I have a patch that moves files around... I can just have 'mv' commands in my patch. But patch still understands the patch and ignores the junk I added to the top.
The other thing I do is that I keep logical bits of work in separate patches. That allows me to deal with one logical piece at a time.
HTH,
Eli --------------------. "If it ain't broke now, Eli Carter \ it will be soon." -- crypto-gram eli.carter(a)inet.com `-------------------------------------------------
-- Kernelnewbies: Help each other learn about the Linux kernel. Archive: http://mail.nl.linux.org/kernelnewbies/ FAQ: http://kernelnewbies.org/faq/
