Re: [B.A.T.M.A.N.] [PATCH 00/26] Staging: batman-adv

[Greg KH <gregkh@suse.de>]

On Sat, May 22, 2010 at 05:08:44PM +0200, Sven Eckelmann wrote:
> Greg KH wrote:
> > On Sat, May 22, 2010 at 04:16:45PM +0200, Sven Eckelmann wrote:
> > > Hi,
> > > 
> > > we've tried to fix the outstanding problem regarding the sysfs filesystem
> > > and fixed some further smaller problems. I hope that it is right were we
> > > put the ABI documentation.
> > 
> > Not really, but I responded to where it should go on that message.
> 
> Thanks. I will move them to the right place.
> 
> > As we are now past the .35 merge window, you should consider what
> > patches should be acceptable for the .35 release, and which should wait
> > until .36.  It looks like about half of these patches should be queued
> > up for .35 as they are bug fixes, right?  The api changes by moving
> > stuff into debugfs should wait for .36.
> 
> The merge window is already closed? v2.6.34 was released 6 days ago. Or do you 
> mean that your merge window for staging is closed?

The merge window is for the subsystem maintainers to send stuff to
Linus.  That stuff must have already been in the linux-next tree for a
bit to test it out and ensure that it doesn't break anyone.

So that means that you need to get things to the subsystem maintainers a
week or so before the merge window opens up if you want to see it go
into the next kernel release.

And yes, this means the merge window for the staging tree for new
features is now closed.  Only bugfixes will be accepted for .35 from now
on, but I can easily queue up stuff for .36, I just have to wait until
.35-rc1 is out before I can add it to my public tree for inclusion in
the linux-next tree.

Hope this explains things a bit better.

greg k-h