On Wed, Jun 11, 2003 at 01:34:41PM -0400, Ed L Cashin wrote: > 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 I use the nightly snapshots at ftp://ftp.kernel.org/pub/linux/kernel/v2.5/snapshots/ to generate the nightly updates to pgcl at ftp://ftp.kernel.org/pub/linux/kernel/people/wli/vm/pgcl/ Believe me when I say it's far easier to update large patches against the nightly snapshots on a nightly basis so the merge conflicts are small and merging problems are closer to well-contained instead of massive merge conflicts and widespread bugs introduced while merging. -- wli -- Kernelnewbies: Help each other learn about the Linux kernel. Archive: http://mail.nl.linux.org/kernelnewbies/ FAQ: http://kernelnewbies.org/faq/
