Repository : ssh://git@open-mesh.org/doc
On branches: backup-redmine/2017-07-13,master
commit 09182ab942eeb27b358bbff115d1d19f6e3f2a8d Author: Sven Eckelmann sven@narfation.org Date: Sat Dec 18 13:47:25 2010 +0000
doc: batman-adv/SubmittingLinux: replace staging with net
09182ab942eeb27b358bbff115d1d19f6e3f2a8d batman-adv/SubmittingLinux.textile | 230 ++++++++++++++++++------------------- 1 file changed, 115 insertions(+), 115 deletions(-)
diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index 1ad06aad..be91d2bb 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -14,7 +14,7 @@ Following steps must always be done: * check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) * format patches * check commit messages author/signed-off-by of patches - * Add "Staging: batman-adv: " before each commit subject + * Add "batman-adv: " before each commit subject * get current version of linux-next * create working branch on linux-next * apply all patches on linux next @@ -57,26 +57,26 @@ From git+ssh://open-mesh.org/srv/git/ecsv/linux-merge Checking out files: 100%25 (32337/32337), done. Switched to branch 'linux' '-(%25)-(linux)> git merge -s subtree origin/next -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile -CONFLICT (delete/modify): drivers/staging/batman-adv/Makefile.kbuild deleted in HEAD and modified in next. Version next of drivers/staging/batman-adv/Makefile.kbuild left in tree. -CONFLICT (delete/modify): drivers/staging/batman-adv/compat.h deleted in HEAD and modified in next. Version next of drivers/staging/batman-adv/compat.h left in tree. -Auto-merging drivers/staging/batman-adv/main.c -Auto-merging drivers/staging/batman-adv/originator.c -Auto-merging drivers/staging/batman-adv/routing.c -Auto-merging drivers/staging/batman-adv/send.c -Auto-merging drivers/staging/batman-adv/soft-interface.c -Auto-merging drivers/staging/batman-adv/translation-table.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in HEAD and modified in next. Version next of net/batman-adv/Makefile.kbuild left in tree. +CONFLICT (delete/modify): net/batman-adv/compat.h deleted in HEAD and modified in next. Version next of net/batman-adv/compat.h left in tree. +Auto-merging net/batman-adv/main.c +Auto-merging net/batman-adv/originator.c +Auto-merging net/batman-adv/routing.c +Auto-merging net/batman-adv/send.c +Auto-merging net/batman-adv/soft-interface.c +Auto-merging net/batman-adv/translation-table.c +Auto-merging net/batman-adv/vis.c Automatic merge failed; fix conflicts and then commit the result. -'-(%25)-(linux)> git rm drivers/staging/batman-adv/Makefile.kbuild drivers/staging/batman-adv/compat.h -drivers/staging/batman-adv/Makefile: needs merge -drivers/staging/batman-adv/Makefile.kbuild: needs merge -drivers/staging/batman-adv/compat.h: needs merge -rm 'drivers/staging/batman-adv/Makefile.kbuild' -rm 'drivers/staging/batman-adv/compat.h' -'-(%25)-(linux)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(linux)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(linux)> git rm net/batman-adv/Makefile.kbuild net/batman-adv/compat.h +net/batman-adv/Makefile: needs merge +net/batman-adv/Makefile.kbuild: needs merge +net/batman-adv/compat.h: needs merge +rm 'net/batman-adv/Makefile.kbuild' +rm 'net/batman-adv/compat.h' +'-(%25)-(linux)> vim net/batman-adv/Makefile +'-(%25)-(linux)> git add net/batman-adv/Makefile '-(%25)-(linux)> git commit [linux f2204f0] Merge remote branch 'origin/next' into linux }}} @@ -84,14 +84,14 @@ rm 'drivers/staging/batman-adv/compat.h' == check for compat code ==
{{{ -git grep compat.h drivers/staging/batman-adv/ -drivers/staging/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h +git grep compat.h net/batman-adv/ +net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h }}}
== check difference with next ==
{{{ -git diff origin/next: linux:drivers/staging/batman-adv/ +git diff origin/next: linux:net/batman-adv/ }}}
Here you should see the @@ -114,7 +114,7 @@ Compressing objects: 100%25 (12/12), done. Writing objects: 100%25 (12/12), 1.75 KiB, done. Total 12 (delta 11), reused 0 (delta 0) Generating commit mails...done -fatal: Not a valid object name master:drivers/staging/batman-adv/TODO +fatal: Not a valid object name master:net/batman-adv/TODO To git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git * [new tag] GregKH-20100625 -> GregKH-20100625 }}} @@ -125,75 +125,75 @@ To git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git '-(%25)-(linux)> git checkout -b patches '-(%25)-(patches)> git rebase -s subtree GregKH-20100618 First, rewinding head to replay your work on top of it... -Auto-merging drivers/staging/batman-adv/main.c -Auto-merging drivers/staging/batman-adv/routing.c -Auto-merging drivers/staging/batman-adv/send.c -Auto-merging drivers/staging/batman-adv/soft-interface.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/main.c +Auto-merging net/batman-adv/routing.c +Auto-merging net/batman-adv/send.c +Auto-merging net/batman-adv/soft-interface.c +Auto-merging net/batman-adv/vis.c [detached HEAD 166b2ca] batman-adv: Convert names from Java to C style Author: Antonio Quartulli ordex@ritirata.org 7 files changed, 18 insertions(+), 18 deletions(-) Committed: 0001 batman-adv: Convert names from Java to C style -Auto-merging drivers/staging/batman-adv/translation-table.c +Auto-merging net/batman-adv/translation-table.c [detached HEAD 5cd6523] batman-adv: Avoid rounding issues for local hna timeout Author: Linus Lüssing linus.luessing@web.de 1 files changed, 1 insertions(+), 1 deletions(-) Committed: 0002 batman-adv: Avoid rounding issues for local hna timeout -Auto-merging drivers/staging/batman-adv/originator.c -Auto-merging drivers/staging/batman-adv/translation-table.c -Auto-merging drivers/staging/batman-adv/vis.c +Auto-merging net/batman-adv/originator.c +Auto-merging net/batman-adv/translation-table.c +Auto-merging net/batman-adv/vis.c [detached HEAD 83d1bc8] batman-adv: Lower resolution for timeouts Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de 5 files changed, 7 insertions(+), 10 deletions(-) Committed: 0003 batman-adv: Lower resolution for timeouts -Auto-merging drivers/staging/batman-adv/send.c +Auto-merging net/batman-adv/send.c [detached HEAD 9e9605f] batman-adv: replace manual calculation by msecs_to_jiffies() for better readability Author: Marek Lindner lindner_marek@yahoo.de 1 files changed, 4 insertions(+), 4 deletions(-) Committed: 0004 batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -[detached HEAD 043aa9a] Staging: batman-adv: Add sysfs abi documentation about bonding +[detached HEAD 043aa9a] batman-adv: Add sysfs abi documentation about bonding Author: Marek Lindner lindner_marek@yahoo.de 1 files changed, 8 insertions(+), 0 deletions(-) -Committed: 0005 Staging: batman-adv: Add sysfs abi documentation about bonding +Committed: 0005 batman-adv: Add sysfs abi documentation about bonding [detached HEAD f6d8bab] batman-adv: adapting source version to revised versioning scheme Author: Marek Lindner lindner_marek@yahoo.de 1 files changed, 1 insertions(+), 1 deletions(-) Committed: 0006 batman-adv: adapting source version to revised versioning scheme -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile
When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> vim net/batman-adv/Makefile +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git add net/batman-adv/Makefile '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rebase -s subtree --continue Already applied: 0007 batman-adv: Use nproc to get number of available processors -CONFLICT (delete/modify): drivers/staging/batman-adv/compat.h deleted in GregKH-20100618 and modified in HEAD~1. Version HEAD~1 of drivers/staging/batman-adv/compat.h left in tree. +CONFLICT (delete/modify): net/batman-adv/compat.h deleted in GregKH-20100618 and modified in HEAD~1. Version HEAD~1 of net/batman-adv/compat.h left in tree.
When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rm drivers/staging/batman-adv/compat.h -drivers/staging/batman-adv/compat.h: needs merge -rm 'drivers/staging/batman-adv/compat.h' +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rm net/batman-adv/compat.h +net/batman-adv/compat.h: needs merge +rm 'net/batman-adv/compat.h' '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rebase -s subtree --continue [detached HEAD a85d1b4] batman-adv: Add include guards to all header files 17 files changed, 78 insertions(+), 12 deletions(-) Committed: 0008 batman-adv: Add include guards to all header files -Auto-merging drivers/staging/batman-adv/Makefile -CONFLICT (content): Merge conflict in drivers/staging/batman-adv/Makefile -CONFLICT (delete/modify): drivers/staging/batman-adv/Makefile.kbuild deleted in GregKH-20100618 and modified in HEAD~0. Version HEAD~0 of drivers/staging/batman-adv/Makefile.kbuild left in tree. +Auto-merging net/batman-adv/Makefile +CONFLICT (content): Merge conflict in net/batman-adv/Makefile +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in GregKH-20100618 and modified in HEAD~0. Version HEAD~0 of net/batman-adv/Makefile.kbuild left in tree.
When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rm drivers/staging/batman-adv/Makefile.kbuild -drivers/staging/batman-adv/Makefile: needs merge -drivers/staging/batman-adv/Makefile.kbuild: needs merge -rm 'drivers/staging/batman-adv/Makefile.kbuild' -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> vim drivers/staging/batman-adv/Makefile -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git add drivers/staging/batman-adv/Makefile +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rm net/batman-adv/Makefile.kbuild +net/batman-adv/Makefile: needs merge +net/batman-adv/Makefile.kbuild: needs merge +rm 'net/batman-adv/Makefile.kbuild' +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> vim net/batman-adv/Makefile +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git add net/batman-adv/Makefile '-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rebase -s subtree --continue Already applied: 0009 batman-adv: Add support for git revision string All done. @@ -220,7 +220,7 @@ Successfully rebased and updated refs/heads/patches 043aa9a54a5296c6027a5bcd808b8d29cea8a474 f6d8baba5fce6161bc2cee9c97e0afbc139942c0 a85d1b45e4cde0c882a41baaefeec0cd5502416f -'-(%25)-(patches)> cd drivers/staging/batman-adv/ +'-(%25)-(patches)> cd net/batman-adv/ '-(%25)-(patches)> git checkout 166b2caa61fce5260aed4e119671764331fdc62a Previous HEAD position was a85d1b4... batman-adv: Avoid rounding issues for local hna timeout HEAD is now at 166b2ca... batman-adv: Convert names from Java to C style @@ -238,11 +238,11 @@ HEAD is now at 9e9605f... batman-adv: replace manual calculation by msecs_to_jif .... '-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> git checkout 043aa9a54a5296c6027a5bcd808b8d29cea8a474 Previous HEAD position was 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -HEAD is now at 043aa9a... Staging: batman-adv: Add sysfs abi documentation about bonding +HEAD is now at 043aa9a... batman-adv: Add sysfs abi documentation about bonding '-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` ... '-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> git checkout f6d8baba5fce6161bc2cee9c97e0afbc139942c0 -Previous HEAD position was 043aa9a... Staging: batman-adv: Add sysfs abi documentation about bonding +Previous HEAD position was 043aa9a... batman-adv: Add sysfs abi documentation about bonding HEAD is now at f6d8bab... batman-adv: adapting source version to revised versioning scheme '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` ... @@ -264,13 +264,13 @@ Switched to branch 'patches' 0002-batman-adv-Avoid-rounding-issues-for-local-hna-timeo.patch 0003-batman-adv-Lower-resolution-for-timeouts.patch 0004-batman-adv-replace-manual-calculation-by-msecs_to_ji.patch -0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch +0005-batman-adv-Add-sysfs-abi-documentation-about.patch 0006-batman-adv-adapting-source-version-to-revised-versio.patch 0007-batman-adv-Add-include-guards-to-all-header-files.patch '-(%25)-(patches)> vim 00*.patch }}}
-Usually I add "Staging: batman-adv: " right when checking the signed-off-by and author (from) line. +Usually I add "batman-adv: " right when checking the signed-off-by and author (from) line.
== apply all patches on linux next ==
@@ -282,13 +282,13 @@ HEAD is now at c3116ae Add linux-next specific files for 20100625 '-(%25)-(master)> git checkout -b greg Switched to a new branch 'greg' '-(%25)-(greg)> git am -3 ../linux-merge/00*.patch -Applying: Staging: batman-adv: Convert names from Java to C style -Applying: Staging: batman-adv: Avoid rounding issues for local hna timeout -Applying: Staging: batman-adv: Lower resolution for timeouts -Applying: Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -Applying: Staging: batman-adv: Add sysfs abi documentation about bonding -Applying: Staging: batman-adv: adapting source version to revised versioning scheme -Applying: Staging: batman-adv: Add include guards to all header files +Applying: batman-adv: Convert names from Java to C style +Applying: batman-adv: Avoid rounding issues for local hna timeout +Applying: batman-adv: Lower resolution for timeouts +Applying: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability +Applying: batman-adv: Add sysfs abi documentation about bonding +Applying: batman-adv: adapting source version to revised versioning scheme +Applying: batman-adv: Add include guards to all header files }}}
== check if all patches build again with linux next == @@ -302,35 +302,35 @@ Applying: Staging: batman-adv: Add include guards to all header files
{{{ '-(%25)-(greg)> git format-patch -s --patience -M master -0001-Staging-batman-adv-Convert-names-from-Java-to-C-styl.patch -0002-Staging-batman-adv-Avoid-rounding-issues-for-local-h.patch -0003-Staging-batman-adv-Lower-resolution-for-timeouts.patch -0004-Staging-batman-adv-replace-manual-calculation-by-mse.patch -0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch -0006-Staging-batman-adv-adapting-source-version-to-revise.patch -0007-Staging-batman-adv-Add-include-guards-to-all-header-.patch +0001-batman-adv-Convert-names-from-Java-to-C-styl.patch +0002-batman-adv-Avoid-rounding-issues-for-local-h.patch +0003-batman-adv-Lower-resolution-for-timeouts.patch +0004-batman-adv-replace-manual-calculation-by-mse.patch +0005-batman-adv-Add-sysfs-abi-documentation-about.patch +0006-batman-adv-adapting-source-version-to-revise.patch +0007-batman-adv-Add-include-guards-to-all-header-.patch '-(%25)-(greg)> ./scripts/checkpatch.pl --strict 00*.patch total: 0 errors, 0 warnings, 0 checks, 135 lines checked
-0001-Staging-batman-adv-Convert-names-from-Java-to-C-styl.patch has no obvious style problems and is ready for submission. +0001-batman-adv-Convert-names-from-Java-to-C-styl.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked
-0002-Staging-batman-adv-Avoid-rounding-issues-for-local-h.patch has no obvious style problems and is ready for submission. +0002-batman-adv-Avoid-rounding-issues-for-local-h.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 55 lines checked
-0003-Staging-batman-adv-Lower-resolution-for-timeouts.patch has no obvious style problems and is ready for submission. +0003-batman-adv-Lower-resolution-for-timeouts.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 19 lines checked
-0004-Staging-batman-adv-replace-manual-calculation-by-mse.patch has no obvious style problems and is ready for submission. +0004-batman-adv-replace-manual-calculation-by-mse.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 14 lines checked
-0005-Staging-batman-adv-Add-sysfs-abi-documentation-about.patch has no obvious style problems and is ready for submission. +0005-batman-adv-Add-sysfs-abi-documentation-about.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 8 lines checked
-0006-Staging-batman-adv-adapting-source-version-to-revise.patch has no obvious style problems and is ready for submission. +0006-batman-adv-adapting-source-version-to-revise.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 0 checks, 239 lines checked
-0007-Staging-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. +0007-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. }}}
== submit patches == @@ -351,13 +351,13 @@ GIT: for the patch you are writing. GIT: GIT: Clear the body content if you don't wish to send a summary. From: Sven Eckelmann sven.eckelmann@gmx.de -Subject: Staging: batman-adv for 2.6.36 (3) +Subject: batman-adv for 2.6.36 (3) In-Reply-To:
Hi,
here are patches targeted for 2.6.36. All patches needed for that patchset are -already part of your staging-next tree. +already part of your net-next tree.
All patches are cleanup patches and no new feature is added.
@@ -365,48 +365,48 @@ thanks, Sven
Antonio Quartulli (1): - Staging: batman-adv: Convert names from Java to C style + batman-adv: Convert names from Java to C style
Linus Lüssing (1): - Staging: batman-adv: Avoid rounding issues for local hna timeout + batman-adv: Avoid rounding issues for local hna timeout
Marek Lindner (4): - Staging: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability - Staging: batman-adv: Add sysfs abi documentation about bonding - Staging: batman-adv: adapting source version to revised versioning scheme - Staging: batman-adv: fix early debugfs deinitialization + batman-adv: replace manual calculation by msecs_to_jiffies() for better readability + batman-adv: Add sysfs abi documentation about bonding + batman-adv: adapting source version to revised versioning scheme + batman-adv: fix early debugfs deinitialization
Simon Wunderlich (1): - Staging: batman-adv: Lower resolution for timeouts + batman-adv: Lower resolution for timeouts
Sven Eckelmann (1): - Staging: batman-adv: Add include guards to all header files - - drivers/staging/batman-adv/aggregation.h | 5 +++++ - drivers/staging/batman-adv/bat_debugfs.h | 6 +++--- - drivers/staging/batman-adv/bat_sysfs.h | 6 +++--- - drivers/staging/batman-adv/bitarray.h | 4 ++++ - drivers/staging/batman-adv/hard-interface.h | 5 +++++ - drivers/staging/batman-adv/hash.h | 8 +++++--- - drivers/staging/batman-adv/icmp_socket.h | 5 +++++ - drivers/staging/batman-adv/main.c | 4 ++-- - drivers/staging/batman-adv/main.h | 13 +++++++++---- - drivers/staging/batman-adv/originator.c | 6 ++---- - drivers/staging/batman-adv/originator.h | 5 +++++ - drivers/staging/batman-adv/packet.h | 5 +++++ - drivers/staging/batman-adv/ring_buffer.h | 5 +++++ - drivers/staging/batman-adv/routing.c | 6 +++--- - drivers/staging/batman-adv/routing.h | 5 +++++ - drivers/staging/batman-adv/send.c | 14 +++++++------- - drivers/staging/batman-adv/send.h | 5 +++++ - drivers/staging/batman-adv/soft-interface.c | 6 +++--- - drivers/staging/batman-adv/soft-interface.h | 7 ++++++- - drivers/staging/batman-adv/sysfs-class-net-mesh | 8 ++++++++ - drivers/staging/batman-adv/translation-table.c | 3 +-- - drivers/staging/batman-adv/translation-table.h | 5 +++++ - drivers/staging/batman-adv/types.h | 6 +++--- - drivers/staging/batman-adv/vis.c | 14 +++++++------- - drivers/staging/batman-adv/vis.h | 7 ++++++- + batman-adv: Add include guards to all header files + + net/batman-adv/aggregation.h | 5 +++++ + net/batman-adv/bat_debugfs.h | 6 +++--- + net/batman-adv/bat_sysfs.h | 6 +++--- + net/batman-adv/bitarray.h | 4 ++++ + net/batman-adv/hard-interface.h | 5 +++++ + net/batman-adv/hash.h | 8 +++++--- + net/batman-adv/icmp_socket.h | 5 +++++ + net/batman-adv/main.c | 4 ++-- + net/batman-adv/main.h | 13 +++++++++---- + net/batman-adv/originator.c | 6 ++---- + net/batman-adv/originator.h | 5 +++++ + net/batman-adv/packet.h | 5 +++++ + net/batman-adv/ring_buffer.h | 5 +++++ + net/batman-adv/routing.c | 6 +++--- + net/batman-adv/routing.h | 5 +++++ + net/batman-adv/send.c | 14 +++++++------- + net/batman-adv/send.h | 5 +++++ + net/batman-adv/soft-interface.c | 6 +++--- + net/batman-adv/soft-interface.h | 7 ++++++- + net/batman-adv/sysfs-class-net-mesh | 8 ++++++++ + net/batman-adv/translation-table.c | 3 +-- + net/batman-adv/translation-table.h | 5 +++++ + net/batman-adv/types.h | 6 +++--- + net/batman-adv/vis.c | 14 +++++++------- + net/batman-adv/vis.h | 7 ++++++- 25 files changed, 117 insertions(+), 46 deletions(-)