commits

commits@lists.open-mesh.org

1 participants
12395 discussions

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Tweaking: switch to non-controversy git branch names (502d987d)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 502d987db823697cc6f6423b1727aa1ec3576351 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:28:04 2022 +0000 doc: batman-adv/Tweaking: switch to non-controversy git branch names >--------------------------------------------------------------- 502d987db823697cc6f6423b1727aa1ec3576351 batman-adv/Tweaking.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/batman-adv/Tweaking.textile b/batman-adv/Tweaking.textile index 841b4c97..1e5a0ff1 100644 --- a/batman-adv/Tweaking.textile +++ b/batman-adv/Tweaking.textile @@ -104,7 +104,7 @@ h3. bridge loop avoidance Available since: batman-adv 2012.2.0 (if bridge loop avoidance has been compiled-in) In bridged LAN setups it is advisable to enable the bridge loop avoidance in order to avoid broadcast loops that can bring the entire LAN to a standstill. The [[Bridge-loop-avoidance|bridge loop avoidance page]] explains the bridge loop problematic in greater detail as well as the batman-adv approach to address it. -It is necessary to activate the bridge loop avoidance at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/README.external to learn how to set the compile option). +It is necessary to activate the bridge loop avoidance at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/README.external to learn how to set the compile option). <pre> batctl meshif bat0 bridge_loop_avoidance @@ -116,7 +116,7 @@ h3. distributed ARP table Available since: batman-adv 2013.0.0 When enabled the distributed ARP table forms a mesh-wide ARP cache that helps non-mesh clients to get ARP responses much more reliably and without much delay. A comprehensive documentation has been made available in our wiki. One document focuses on the [[batman-adv:DistributedARPTable|general DAT concept]] whereas the second document is about the [[DistributedArpTable-technical|technical details & implementation specifics]]. -It is necessary to activate the distributed ARP table at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/README.external to learn how to set the compile option). +It is necessary to activate the distributed ARP table at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/README.external to learn how to set the compile option). <pre> batctl meshif bat0 distributed_arp_table @@ -192,7 +192,7 @@ h3. log level Available since: batman-adv 2010.1.0 -The standard warning and error messages which help to setup & operate batman-adv are sent to the kernel log. However, batman-adv also offers extended logs that can be used to understand and/or debug the routing protocol. Keep in mind that it is necessary to activate debugging at compile time before you can use these facilities (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/README.external to learn how to set the compile option). Per default, the logging is deactivated (log level: 0). +The standard warning and error messages which help to setup & operate batman-adv are sent to the kernel log. However, batman-adv also offers extended logs that can be used to understand and/or debug the routing protocol. Keep in mind that it is necessary to activate debugging at compile time before you can use these facilities (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/README.external to learn how to set the compile option). Per default, the logging is deactivated (log level: 0). <pre> batctl meshif bat0 loglevel @@ -224,7 +224,7 @@ h3. network coding Available since: batman-adv 2013.2.0 When enabled network coding increases the WiFi throughput by combining multiple frames into a single frame, thus reducing the needed air time. A comprehensive documentation has been made available in our wiki. One document focuses on the [[batman-adv:NetworkCoding|general network coding concept]] whereas the second document is about the [[NetworkCoding-technical|technical details & implementation specifics]]. Our download section also contains recorded network coding talks. -It is necessary to activate network coding at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/README.external to learn how to set the compile option). +It is necessary to activate network coding at compile time before you can use this feature (consult "the README.external file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/README.external to learn how to set the compile option). <pre> batctl meshif bat0 network_coding

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Understand-your-batman-adv-network: switch to non-controversy git branch names (52dbcbfd)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 52dbcbfd977af5e4b43838345af5a59f7c2214ac Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:27:19 2022 +0000 doc: batman-adv/Understand-your-batman-adv-network: switch to non-controversy git branch names >--------------------------------------------------------------- 52dbcbfd977af5e4b43838345af5a59f7c2214ac batman-adv/Understand-your-batman-adv-network.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Understand-your-batman-adv-network.textile b/batman-adv/Understand-your-batman-adv-network.textile index 0dcc5cec..e573c6b6 100644 --- a/batman-adv/Understand-your-batman-adv-network.textile +++ b/batman-adv/Understand-your-batman-adv-network.textile @@ -357,7 +357,7 @@ Traditional network debugging tools based on the ICMP protocol such as ping or t h2. Logging -Batman-adv offers extended logging to understand & debug the routing protocol internals. After you activated debugging +tracing at compile time (instructions can be found in "the README file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/README.external ) and the appropriate log level has been set (read about the log levels [[tweaking|here]]) you can retrieve the logs by simply reading the 'log' file: +Batman-adv offers extended logging to understand & debug the routing protocol internals. After you activated debugging +tracing at compile time (instructions can be found in "the README file":https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/README.external ) and the appropriate log level has been set (read about the log levels [[tweaking|here]]) you can retrieve the logs by simply reading the 'log' file: <pre> $ batctl ll all

1 0

[doc] backup-redmine/2023-01-14,main: doc: open-mesh/UsingBatmanGit: switch to non-controversy git branch names (2f8250c2)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 2f8250c296ba32ee0a3c57ec572496556b99828f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:31:12 2022 +0000 doc: open-mesh/UsingBatmanGit: switch to non-controversy git branch names >--------------------------------------------------------------- 2f8250c296ba32ee0a3c57ec572496556b99828f open-mesh/UsingBatmanGit.textile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/open-mesh/UsingBatmanGit.textile b/open-mesh/UsingBatmanGit.textile index 78a3f4e6..ad11971f 100644 --- a/open-mesh/UsingBatmanGit.textile +++ b/open-mesh/UsingBatmanGit.textile @@ -21,27 +21,27 @@ h2. Branches The main git repository is divided into several branches to make working easier. -h3. master branch +h3. main branch -The master branch will have all upcoming changes. Bugfixes are merged from maint to master. +The main branch will have all upcoming changes. Bugfixes are merged from stable to main. -h3. maint branch +h3. stable branch -The maint only gathers bug fixes for the last release. +The stable only gathers bug fixes for the last release. Create branch associated with the remote-tracking branch after cloning the repository <pre> -git switch -c maint --track origin/maint +git switch -c stable --track origin/stable </pre> -Cherry-picking a commit from master branch +Cherry-picking a commit from main branch <pre> -git switch maint +git switch stable git cherry-pick $SHA1 </pre> h3. Linux integration -The linux-merge repository is a clone of netdev's net-next tree. With the help of some git voodoo the master branch is merged with this branch in the folder: net/batman-adv/. If you wish to merge the latest master branch changes into the linux branch you need to [[batman-adv:SubmittingLinux|pull the newest changes in master from the batman-adv.git]] repository. \ No newline at end of file +The linux-merge repository is a clone of netdev's net-next tree. With the help of some git voodoo the main branch is merged with this branch in the folder: net/batman-adv/. If you wish to merge the latest main branch changes into the linux branch you need to [[batman-adv:SubmittingLinux|pull the newest changes in main from the batman-adv.git]] repository. \ No newline at end of file

1 0

[doc] backup-redmine/2023-01-14,main: doc: open-mesh/Contribute: switch to non-controversy git branch names (1c272e15)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 1c272e1557f1402d6cf726d36c97a10c99b7d9c7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:31:58 2022 +0000 doc: open-mesh/Contribute: switch to non-controversy git branch names >--------------------------------------------------------------- 1c272e1557f1402d6cf726d36c97a10c99b7d9c7 open-mesh/Contribute.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/Contribute.textile b/open-mesh/Contribute.textile index fd27d63e..12702da5 100644 --- a/open-mesh/Contribute.textile +++ b/open-mesh/Contribute.textile @@ -75,7 +75,7 @@ If you intend to send us patches, please consider the following guidelines: * Add a "Signed-off-by: Your Name <you(a)example.com>" line to the patch message to make the ownership of the patch clear. * Patches for B.A.T.M.A.N. Advanced need to follow the linux kernel coding style closely (use checkpatch.pl to verify your patch) as well as the linux "how to submit patches" guidelines (search for the term SubmitPatches to find thorough documentation). * Check it using static analysis tools like "sparse":https://sparse.wiki.kernel.org/ (cgcc) and "cppcheck":http://cppcheck.sourceforge.net/ -* Patches against the batman-adv master branch must be formatted using +* Patches against the batman-adv main branch must be formatted using <pre> git format-patch $BASECOMMIT </pre>

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Release-todo: switch to non-controversy git branch names (9198baf8)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 9198baf80102dffb088d90548aa82a39c36d63d6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:30:37 2022 +0000 doc: batman-adv/Release-todo: switch to non-controversy git branch names >--------------------------------------------------------------- 9198baf80102dffb088d90548aa82a39c36d63d6 batman-adv/Release-todo.textile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index fce7593a..e0640017 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -7,10 +7,10 @@ h2. Release Scheduling !/attachments/download/706/release_scheduling.svg! -* master branch is closed whenever net-next is closed -* master branch is released as feature release 20_ _.a after net-next is closed (whenever Linus released a final Linux version) +* main branch is closed whenever net-next is closed +* main branch is released as feature release 20_ _.a after net-next is closed (whenever Linus released a final Linux version) ** actually only the patches which were really submitted should be released (when possible) -* maint branch is released on demand +* stable branch is released on demand ** for example after security issues ** when net.git/Linux was released with important fixes and users cannot switch to new feature release (which is done at the same time) @@ -28,7 +28,7 @@ h2. Code * [ ] check coverity scan status * [ ] remove dead code (if any) * [ ] check against kernel versions -* [ ] check that maint branch is merged in master +* [ ] check that stable branch is merged in main * [ ] check for "open patches on the ml":https://patchwork.open-mesh.org/project/b.a.t.m.a.n./list/ * [ ] git tag release @@ -49,7 +49,7 @@ h2. Distributions h2. Aftershow -* [ ] Merge current git tag into maint (must be --ff-only or pre-tagging steps were done wrong - git merge --ff-only v20xx.x.x) +* [ ] Merge current git tag into stable (must be --ff-only or pre-tagging steps were done wrong - git merge --ff-only v20xx.x.x) * [ ] close "current version":https://www.open-mesh.org/projects/batman-adv/settings/versions * [ ] add "new upcoming version":https://www.open-mesh.org/projects/batman-adv/versions/new * [ ] Mark issues from "Resolved to Closed":https://www.open-mesh.org/projects/batman-adv/issues?utf8=%E2%9C%93&set_filter=1&f%5B%5D=status_id&op%5Bstatus_id%5D=%3D&v%5Bstatus_id%5D%5B%5D=3 \ No newline at end of file

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/SubmittingLinux: switch to non-controversy git branch names (6237b61f)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 6237b61f8f7d4271f13512137cce6287b6bc63ae Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:26:33 2022 +0000 doc: batman-adv/SubmittingLinux: switch to non-controversy git branch names >--------------------------------------------------------------- 6237b61f8f7d4271f13512137cce6287b6bc63ae batman-adv/SubmittingLinux.textile | 104 ++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index 2fca888f..b41318b3 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -8,7 +8,7 @@ We currently submit patches for Linux from our next branch. I try to give a shor Following steps must always be done: * get the linux-integration + batman-adv repository -* get the newest patches from next and maint +* get the newest patches from main and stable * check for compat code * squash/cleanup patches * fix "Fixes: " and other commit id references @@ -27,10 +27,10 @@ Following steps must always be done: h2. Rules for patch handling -* new patches enter batman-adv.git master branch -* new patches are forwarded to David from master branch -* master branch is closed whenever net-next is closed -* new patches for master should be avoided when Linux -rc7/final is near (which will cause the closing of net-next) +* new patches enter batman-adv.git main branch +* new patches are forwarded to David from main branch +* main branch is closed whenever net-next is closed +* new patches for main should be avoided when Linux -rc7/final is near (which will cause the closing of net-next) h2. Variables @@ -38,9 +38,9 @@ There are different basepoints/references used when preparing the * GIT_OM_SERVER ** server from which the open-mesh.org repositories are retrieved -* LM_MASTER +* LM_MAIN ** name of branch in batman-adv.git which points to the latest patch already ported to linux-merge.git:batadv/net-next -* LM_MAINT +* LM_STABLE ** name of branch in batman-adv.git which points to the latest patch already ported to linux-merge.git:batadv/net * BASE_NETNEXT ** some recent commit in net-next.git which should be used as base commit for the patches which will be applied (chose wisely) @@ -49,8 +49,8 @@ There are different basepoints/references used when preparing the <pre> GIT_OM_SERVER="git+ssh://git@open-mesh.org" -LM_MASTER=ecsv/lm_master -LM_MAINT=ecsv/lm_maint +LM_MAIN=ecsv/lm_main +LM_STABLE=ecsv/lm_stable BASE_NETNEXT=v4.16-rc1 BASE_NET=v4.16-rc1 </pre> @@ -69,16 +69,16 @@ git -C linux-merge branch base/net-next --track origin/base/net-next git -C linux-merge branch batadv/net --track origin/batadv/net git -C linux-merge branch batadv/net-next --track origin/batadv/net-next git clone "${GIT_OM_SERVER}/batman-adv.git" batman-adv -git -C batman-adv branch "${LM_MASTER}" --track "origin/${LM_MASTER}" -git -C batman-adv branch "${LM_MAINT}" --track "origin/${LM_MAINT}" +git -C batman-adv branch "${LM_MAIN}" --track "origin/${LM_MAIN}" +git -C batman-adv branch "${LM_STABLE}" --track "origin/${LM_STABLE}" </pre> The next step is to make sure that out linux-merge.git branches are either on top or equal the chosen. It should also be checked first that it is really a basepoint in the chosen branches <pre> git -C linux-merge remote update --prune -git -C linux-merge branch -r --contains="${BASE_NET}" net/master -git -C linux-merge branch -r --contains="${BASE_NETNEXT}" net-next/master +git -C linux-merge branch -r --contains="${BASE_NET}" net/main +git -C linux-merge branch -r --contains="${BASE_NETNEXT}" net-next/main git -C linux-merge switch base/net git -C linux-merge merge --ff-only "origin/base/net" @@ -93,27 +93,27 @@ git -C linux-merge push origin base/net base/net-next Problems during this have to either be fixed by using a correct base commit, fixing the local branches or by rebasing the remaining patches on the batadv/* branches on top of the base commits (think twice before rebasing). -The same has to be done for the batman-adv repository. Here it is is important to update the maint branch manually after releases. Otherwise it would look like patches which were already submitted to net-next have to be send again to net. But make sure that there are no actual fixes between ${LM_MAINT} and origin/maint which were missed earlier +The same has to be done for the batman-adv repository. Here it is is important to update the stable branch manually after releases. Otherwise it would look like patches which were already submitted to net-next have to be send again to net. But make sure that there are no actual fixes between ${LM_STABLE} and origin/stable which were missed earlier <pre> git -C batman-adv remote update --prune -git -C batman-adv switch "${LM_MAINT}" -git -C batman-adv merge --ff-only "origin/${LM_MAINT}" +git -C batman-adv switch "${LM_STABLE}" +git -C batman-adv merge --ff-only "origin/${LM_STABLE}" -git -C batman-adv switch "${LM_MASTER}" -git -C batman-adv merge --ff-only "origin/${LM_MASTER}" +git -C batman-adv switch "${LM_MAIN}" +git -C batman-adv merge --ff-only "origin/${LM_MAIN}" </pre> h2. get the newest patches -h3. from master +h3. from main <pre> cd batman-adv -git switch -C rebase --no-track origin/master -GIT_SEQUENCE_EDITOR="sh -c 'git rev-list --reverse --no-merges '\\''${LM_MASTER}..origin/master'\\'' --not origin/maint|awk '\\''{ print \"pick \"\$1}'\\'' > \$1' \$@" \ - git rebase -i origin/maint --onto "${LM_MASTER}" --no-ff +git switch -C rebase --no-track origin/main +GIT_SEQUENCE_EDITOR="sh -c 'git rev-list --reverse --no-merges '\\''${LM_MAIN}..origin/main'\\'' --not origin/stable|awk '\\''{ print \"pick \"\$1}'\\'' > \$1' \$@" \ + git rebase -i origin/stable --onto "${LM_MAIN}" --no-ff </pre> This patches have to be cleaned up. First these these changes have to be squashed so that "Fixes: " patches are squashed together with the patches which introduced the problem (when they exist). Also compat code has to be removed. Both things can be identified with git log: @@ -121,20 +121,20 @@ This patches have to be cleaned up. First these these changes have to be squashe Patches with "Fixes: " lines: <pre> -git log --grep='^Fixes: ' "${LM_MASTER}"..rebase +git log --grep='^Fixes: ' "${LM_MAIN}"..rebase </pre> The extra stuff which should not be submitted can be identified via: <pre> -git log --stat --oneline "${LM_MASTER}"..rebase -- compat-sources compat-include README.external CHANGELOG Makefile .gitignore .gitattributes compat.h gen-compat-autoconf.sh README -git log -p -SUGLY_HACK "${LM_MASTER}"..rebase +git log --stat --oneline "${LM_MAIN}"..rebase -- compat-sources compat-include README.external CHANGELOG Makefile .gitignore .gitattributes compat.h gen-compat-autoconf.sh README +git log -p -SUGLY_HACK "${LM_MAIN}"..rebase </pre> This can all be cleaned up by using git-rebase and then marking the relevant commits for editing. It may also be a good idea to move patches like "Start-new-development-cycle" to the front <pre> -git rebase -i "${LM_MASTER}" +git rebase -i "${LM_MAIN}" # edit the commit message to point to the correct upstream commit -- just search in linux-merge for the commit name git commit --amend @@ -152,30 +152,30 @@ git rebase --continue It is a good idea to check again if some file was missed. It is also a good idea to manually check the commit messages for other commit references: <pre> -git log --stat "${LM_MASTER}"..rebase +git log --stat "${LM_MAIN}"..rebase </pre> If everything looks good then these patches should be formatted (make sure that you don't have some old patches in the directory). The branch of already prepared patches has to be updated <pre> -git format-patch -s "${LM_MASTER}"..rebase -git switch "${LM_MASTER}" -git merge --ff-only origin/master -git push origin "${LM_MASTER}" +git format-patch -s "${LM_MAIN}"..rebase +git switch "${LM_MAIN}" +git merge --ff-only origin/main +git push origin "${LM_MAIN}" </pre> -Save the generated patches to a save place. Lets call this place $EXPORTED_PATCHES_MASTER +Save the generated patches to a save place. Lets call this place $EXPORTED_PATCHES_MAIN -h3. from maint +h3. from stable -Make sure that ${LM_MASTER} was updated after a release correctly and ${LM_MASTER}..origin/maint is containing patches which were send to net-next +Make sure that ${LM_MAIN} was updated after a release correctly and ${LM_MAIN}..origin/stable is containing patches which were send to net-next The rest of the rebase process works similar to the next process <pre> cd batman-adv -git switch -C rebase --no-track origin/maint -git rebase -i "${LM_MAINT}" +git switch -C rebase --no-track origin/stable +git rebase -i "${LM_STABLE}" </pre> This patches have to be cleaned up. First these these changes have to be squashed so that "Fixes: " patches are squashed together with the patches which introduced the problem (when they exist). Also compat code has to be removed. Both things can be identified with git log: @@ -183,20 +183,20 @@ This patches have to be cleaned up. First these these changes have to be squashe Patches with "Fixes: " lines: <pre> -git log --grep='^Fixes: ' "${LM_MAINT}"..rebase +git log --grep='^Fixes: ' "${LM_STABLE}"..rebase </pre> The extra stuff which should not be submitted can be identified via: <pre> -git log --stat --oneline "${LM_MAINT}"..rebase -- compat-sources compat-include README.external CHANGELOG Makefile .gitignore .gitattributes compat.h gen-compat-autoconf.sh README -git log -p -SUGLY_HACK "${LM_MAINT}"..rebase +git log --stat --oneline "${LM_STABLE}"..rebase -- compat-sources compat-include README.external CHANGELOG Makefile .gitignore .gitattributes compat.h gen-compat-autoconf.sh README +git log -p -SUGLY_HACK "${LM_STABLE}"..rebase </pre> This can all be cleaned up by using git-rebase and then marking the relevant commits for editing. It may also be a good idea to move patches like "Start-new-development-cycle" to the front <pre> -git rebase -i "${LM_MAINT}" +git rebase -i "${LM_STABLE}" # edit the commit message to point to the correct upstream commit -- just search in linux-merge for the commit name git commit --amend @@ -214,23 +214,23 @@ git rebase --continue It is a good idea to check again if some file was missed. It is also a good idea to manually check the commit messages for other commit references or missing signed-off-by: <pre> -git log --stat "${LM_MAINT}"..rebase +git log --stat "${LM_STABLE}"..rebase </pre> If everything looks good then these patches should be formatted (make sure that you don't have some old patches in the directory). The branch of already prepared patches has to be updated <pre> -git format-patch -s "${LM_MAINT}"..rebase -git switch "${LM_MAINT}" -git merge --ff-only origin/maint -git push origin "${LM_MAINT}" +git format-patch -s "${LM_STABLE}"..rebase +git switch "${LM_STABLE}" +git merge --ff-only origin/stable +git push origin "${LM_STABLE}" </pre> -Save the generated patches to a save place. Lets call this place $EXPORTED_PATCHES_MAINT +Save the generated patches to a save place. Lets call this place $EXPORTED_PATCHES_STABLE h2. Apply patches on linux-merge -h3. from master +h3. from main The patches were already exported. So they only have to be applied in the correct branch @@ -238,12 +238,12 @@ The patches were already exported. So they only have to be applied in the correc cd linux-merge git switch batadv/net-next git merge --ff-only origin/batadv/net-next -./scripts/checkpatch --strict "${EXPORTED_PATCHES_MASTER}"/*.patch -git am -s "${EXPORTED_PATCHES_MASTER}"/*.patch +./scripts/checkpatch --strict "${EXPORTED_PATCHES_MAIN}"/*.patch +git am -s "${EXPORTED_PATCHES_MAIN}"/*.patch git push origin batadv/net-next </pre> -h3. from maint +h3. from stable The patches were already exported. So they only have to be applied in the correct branch @@ -251,8 +251,8 @@ The patches were already exported. So they only have to be applied in the correc cd linux-merge git switch batadv/net git merge --ff-only origin/batadv/net -./scripts/checkpatch --strict "${EXPORTED_PATCHES_MAINT}"/*.patch -git am -s "${EXPORTED_PATCHES_MAINT}"/*.patch +./scripts/checkpatch --strict "${EXPORTED_PATCHES_STABLE}"/*.patch +git am -s "${EXPORTED_PATCHES_STABLE}"/*.patch git push origin batadv/net </pre>

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/LinuxNextTracking: switch to non-controversy git branch names (4bf5dcf6)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 4bf5dcf6df52bc75d44a8c0d00c94c2ec0430c4d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:27:01 2022 +0000 doc: batman-adv/LinuxNextTracking: switch to non-controversy git branch names >--------------------------------------------------------------- 4bf5dcf6df52bc75d44a8c0d00c94c2ec0430c4d batman-adv/LinuxNextTracking.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv/LinuxNextTracking.textile b/batman-adv/LinuxNextTracking.textile index c20a75e5..e4a2adc7 100644 --- a/batman-adv/LinuxNextTracking.textile +++ b/batman-adv/LinuxNextTracking.textile @@ -21,13 +21,13 @@ cp /srv/git/batman-adv/hooks/post-receive linux-next.git/hooks/manual-hook chmod +x linux-next.git/hooks/manual-hook cat << 'EOF' > linux-next.git/sync-git #! /bin/sh -export MY_REV="refs/heads/master" +export MY_REV="refs/heads/main" export GIT_DIR=/home/batman/linux-next.git cd "$GIT_DIR" cd /home/batman/linux-next.git oldrev="@git rev-parse $MY_REV@" git fetch -newref="@git rev-parse master@" +newref="@git rev-parse main@" if [ "$oldrev" != "$newref" ]; then echo "$oldrev" "$newref" "$MY_REV" | ./hooks/manual-hook fi @@ -35,7 +35,7 @@ EOF chmod +x linux-next.git/sync-git </pre> -The script has to be modified a little bit to get it working after refs/heads/master was modified. Just exchange +The script has to be modified a little bit to get it working after refs/heads/main was modified. Just exchange <pre> git rev-parse --not --branches | grep -v $(git rev-parse $refname) | git rev-list --reverse --stdin $oldrev..$newrev -- net/batman-adv </pre>

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Compatversion: switch to non-controversy git branch names (d285de4a)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit d285de4a2eedc88b230f1fdb6bfac08e4298a44a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:22:26 2022 +0000 doc: batman-adv/Compatversion: switch to non-controversy git branch names >--------------------------------------------------------------- d285de4a2eedc88b230f1fdb6bfac08e4298a44a batman-adv/Compatversion.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Compatversion.textile b/batman-adv/Compatversion.textile index 17cebdbe..b034ba1c 100644 --- a/batman-adv/Compatversion.textile +++ b/batman-adv/Compatversion.textile @@ -1,7 +1,7 @@ h1. batman-adv COMPAT_VERSION -COMPAT_VERSION in packet.h is used to identify an incoming packet and check if it can processed by the current version. The packet structure should be identified by this version. The stuff which appears in a packet jumps a little bit with each version because we change stuff in trunk/master and in next and import those changes to the packet structure out-of-order. +COMPAT_VERSION in packet.h is used to identify an incoming packet and check if it can processed by the current version. The packet structure should be identified by this version. The stuff which appears in a packet jumps a little bit with each version because we change stuff in trunk/main and in next and import those changes to the packet structure out-of-order. Following changes were identified and documented.

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Batman-adv-openwrt-config: switch to non-controversy git branch names (751a4a45)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 751a4a457eecae14770c6ff0e6f99cad267c3d94 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:21:58 2022 +0000 doc: batman-adv/Batman-adv-openwrt-config: switch to non-controversy git branch names >--------------------------------------------------------------- 751a4a457eecae14770c6ff0e6f99cad267c3d94 batman-adv/Batman-adv-openwrt-config.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Batman-adv-openwrt-config.textile b/batman-adv/Batman-adv-openwrt-config.textile index 1cb0025d..008529e7 100644 --- a/batman-adv/Batman-adv-openwrt-config.textile +++ b/batman-adv/Batman-adv-openwrt-config.textile @@ -12,7 +12,7 @@ The batman-adv OpenWrt support provides three different protos: * batadv_hardif ** network interface used by batadv meshif to transport the batman-adv packets -** its master interface is set to the batadv meshif +** it is assignedt to the batadv meshif * batadv (meshif/softif) ** virtual interface that emulates a normal 802.3 interface on top ** encapsulates traffic and forwards it via the batadv hardifs

1 0

[doc] backup-redmine/2023-01-14,main: doc: batman-adv/Packet-types: switch to non-controversy git branch names (5a8eeac0)
by postmaster＠open-mesh.org 14 Jan '23

14 Jan '23

Repository : ssh://git@diktynna/doc On branches: backup-redmine/2023-01-14,main >--------------------------------------------------------------- commit 5a8eeac003a0693377fc0c1f40cca0441fd308e6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 17 13:22:14 2022 +0000 doc: batman-adv/Packet-types: switch to non-controversy git branch names >--------------------------------------------------------------- 5a8eeac003a0693377fc0c1f40cca0441fd308e6 batman-adv/Packet-types.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Packet-types.textile b/batman-adv/Packet-types.textile index 33ed3cd7..eca06b60 100644 --- a/batman-adv/Packet-types.textile +++ b/batman-adv/Packet-types.textile @@ -16,4 +16,4 @@ NOTE: Previous ideas to do the same for broadcast packets have been dropped. The Further reading: -* The latest packet type assignments can be reviewed in the source code: https://git.open-mesh.org/batman-adv.git/blob/refs/heads/master:/packet.h#l… \ No newline at end of file +* The latest packet type assignments can be reviewed in the source code: https://git.open-mesh.org/batman-adv.git/blob/refs/heads/main:/packet.h#l21 \ No newline at end of file

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits