From: Mitch D. <mj...@al...> - 2000-07-04 06:51:19
|
NIIBE Yutaka wrote: > > I'll import 2.4.0-test2 and 2.4.0-test3-pre2 this afternoon. > I'm sure it results conflict. > > I'm not sure why we need LINUS branch, BTW. Are thare anyone using > that stuff? The LINUS branch is the "vendor" branch onto which imports of the official Linux kernel go. The merge phase (which brings Linus' changes into our kernel) works by comparing old-and-new tagged revisions on the LINUS branch, and applying these differences to our "main" branch. These differences are then checked in, giving us the official changes. You may wish to revise this: http://linuxsh.sourceforge.net/docs/importing-kernels.php3 In short, it's necessary for importing official kernels. I would be happy to import 2.4.0-test2 if you like. I can do it tonight in about 4 hours. (I've not been doing it lately because I wanted to wait for Linus to pull in Alan Cox's -ac line of kernels. Now that he's done this with test2, I'll import it). Regards, Mitch. -- mailto:mj...@al... | Certified Linux Evangelist! |