Hey,
Our first patch landed by GregKH just before the merge window for 2.6.33 opened. This patch made it into 2.6.33-rc1. So at around the end of march when 2.6.33 is released, we will be in mainline.
All patches submitted after this first big one was after the merge window closed. So they are currently queued up by GregKH. They appear in linux-next and should be accepted during the 2.6.34 merge window.
thanks a lot for posting this overview!
- We should make it clear on www.open-mesh.org which version of batctl should be used with 2.6.33. The trunk version will not work correctly, an older version is needed. Probably we want to make a tarball release and put it somewhere prominent on the website.
Since a while I maintain batctl 0.2.x in its own branch: http://www.open-mesh.org/browser/branches/batctl-0.2.x As the name implies it should be compatible with batman-adv 0.2.x. It does not contain any links and will build right out of this branch. Are there any known incompatibilities between batman-adv in 2.6.33 and this branch ?
- We still have the chance to get bug fixes into 2.6.33. Is there anything in 2.6.33-rc5 which can cause oopses, deadlocks, etc?
As Sven already pointed out I merged all relevant bugfix patches into the maint branch. Unless I overlooked something it should be ready to go.
- We should review what is currently in subversion but not yet pushed to GregKH ready for 2.6.34. eg gateway support, vis server startup fix, bonding, etc. In another email i will produce a list of patches we should consider.
I think we should stick to our original agreement to not push new features too fast. Gateway stuff, bonding, etc need more time to mature. The vis patch is waiting in the maint branch - ready for inclusion. :)
All this work is currently happening in staging. Once 2.6.33 is released we will get a bit more exposure and hopefully trigger some discussion. 2.6.34-rc1 will be a big step forward and i think at that point we should approach the linux networking guys and ask for a review. That would be one of the first steps of getting out of staging and somewhere under the net directory.
Ok, let's see what happens then.
Regards, Marek