On Sat, Oct 18 2008, Stephen Rothwell wrote: > Hi Jens, > > On Fri, 17 Oct 2008 12:57:55 +0200 Jens Axboe <jens.axboe@xxxxxxxxxx> wrote: > > > > OK, I'm guessing it's a merge mess in linux-next. I tried to look at the > > diff, but it was pretty much impossible to read and even included lots > > of things in -git already. > > If you are looking at the linux-next patch on kernel.org, then it is > relative to 2.6.27, so will contain a lot of stuff in Linus' tree. Its > purpose is to allow people to recreate the linux-next tree from a kernel > tarball. > > In the linux-next git tree, the point in Linus' tree that it is based on > the the "stable" branch. If necessary, people should be able to bisect > between the "stabel" and "master" branches of a linux-next tree. Or, I > am told, between one linux-next tree and another (but that sounds painful > to me). OK, I'll try the -git tree next time I have to lookup changes in -next. Thanks for the explanation! -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
