Hi,
I was told that batman-adv 2015.0 should be released based on patches which are currently in Linux 4.1. I've checked the current state and it seems that there are even patches in Linux 4.0 which aren't yet merged into the out-of-tree module. And also patches of the Linux 4.1 kernel tree aren't applied. The net-next merge window for Linux 4.1 is closed for this kernel but Linus still gathers patches for it. This is also the reason why there are some patches for batman-adv not yet in Linus tree but in David's net.git. Interestingly, some of these patches were already merged in the out-of-tree module - but not all.
This patchset is just to cleanup the current state of net.git. Sorry for all the merge conflicts which may now happen with master and some patches on the mailing list.
Included patches ~~~~~~~~~~~~~~~~
Patches which were missing:
* https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b... * https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b... * https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=a...
Patches which are in batman-adv master but should be in this release:
* http://git.open-mesh.org/batman-adv.git/commit/3f74f359cb7e96bbc68d62e1fc48b...
A patch which should never ever have existed in the first place (please correct me when I've missed the actual problem):
* http://git.open-mesh.org/linux-merge.git/commit/b53915310227cc9b029ba0fa5aae...
The weirdest commit is one which is in batman-adv next but can nowhere be found in the kernel trees. It is already part of the release v2014.2.0:
* http://git.open-mesh.org/batman-adv.git/commit/31f391475cc08724e96ab060ef4aa... (havent touched this commit because this is just too weird)
Releases ~~~~~~~~
I was also under the impression that no one really knew what will be released and what version of the kernel tree it will be based on. How about changing the Release-todo (see attached image)
* maint branch is released as feature release 2015.a after linux 4.x is tagged * 2015.a.y branches are released on demand... most likely never * content of master becomes new maint after release
It is basically an old idea [1] with the branches renamed to keep "master" as the main development branch (submission to David's net-next.git) and "maint" as the branch which gathers bugfixes for net.git.
Kind regards, Sven
[1] https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2012-December/008719.html
