Repository : ssh://git@open-mesh.org/doc
On branches: backup-redmine/2017-07-13,master
commit a906bcc0483bc786b4a917c6afe168941fe7148d Author: Sven Eckelmann sven@narfation.org Date: Tue Jul 5 13:41:20 2011 +0000
doc: batman-adv/Release-todo
a906bcc0483bc786b4a917c6afe168941fe7148d batman-adv/Release-todo.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index fd4e16ae..b5c4ef08 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -48,7 +48,7 @@ h2. Distributions
h2. Aftershow
-* [ ] Merge differences (README, CHANGELOG, ...) into master branch -* [ ] Merge current next into maint (must be fast-forward or pre-tagging steps were done wrong) -* [ ] Get patches for next release from master-rebase/batctl-rebase repository -* [ ] Rebase patches in next on top of linux-next and send it to kernel maintainers for future kernels (+ set version number in kernel) +* [ ] Merge next into master branch (to get changes on README, CHANGELOG, ...) +* [ ] Merge current git tag into maint (must be fast-forward or pre-tagging steps were done wrong) +* [ ] Merge patches from master into next (to get all the fancy new features) +* [ ] Rebase patches in next on top of linux-next and send it to kernel maintainers for future kernels ([[SubmittingLinux]])