Re: linux-next: the purge :-)

Stephen Rothwell
2008-05-09T01:16:29Z

[-- Attachment #1: Type: text/plain, Size: 1962 bytes --]

Hi Greg,

On Thu, 8 May 2008 15:04:43 -0700 Greg KH <greg@kroah.com> wrote:
>
> On Thu, May 08, 2008 at 09:27:15AM +0300, Adrian Bunk wrote:
> > On Wed, May 07, 2008 at 09:27:53PM -0700, Greg KH wrote:
> > >
> > > I've now moved my trees around a bit, and would like it if you could
> > > include the following, in this order (the # NEXT_BASE variable is set in
> > > them to make sure things get ordered properly.)
> > > driver-core.next
> > > usb.next
> > > driver-core
> > > usb
> > > ldp.next
> > >
> > > The ".next" trees are what is going to Linus before the next major
> > > release happens (bugfixes and new device ids at this point in time for
> > > example.) The other trees are what is going to go to Linus after the
> > > next major kernel is out.
> > >...
> >
> > So the "next" in your .next has the opposite meaning of the one in
> > linux-next?
>
> It does? I was following the convention that people used for their git
> tree branch names I thought.

In their git trees, people usually have a branch called "for-linus" for
fixes to the current tree and "for-next" or "for-akpm" (or "devel" or
"testing") for stuff for the next release).

> > Can you name it .fixes instead to make it clearer?
>
> I can name it anything that Stephen wants me to, I'll defer to him as he
> is the only one that will ever really see this.

In linux-next, when the choice is left to me I name the trees like this:

xxx-current bug fixes and stuff not take yet for Linus' current tree
xxx stuff for the next release.

Today I have used your names, but Adrian is correct that they are
inconsistent with (at least) my normal usage.

One question: is the driver in ldp.next intended for 2.6.26? Because if
it is, ldp.next should be based on usb.next, not usb. If not then
ldp.next is wrongly named.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]