commits August 2013

commits@lists.open-mesh.org

1 participants
51 discussions

[linux-merge]linux integration; annotated tag, v3.11-rc6, created. v3.11-rc6
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

The annotated tag, v3.11-rc6 has been created at 2ea699d98cd6f9e9b813c24542d581dedacdc659 (tag) tagging b36f4be3de1b123d8601de062e7dbfc904f305fb (commit) replaces v3.11-rc5 tagged by Linus Torvalds on Sun Aug 18 14:37:07 2013 -0700 - Shortlog ------------------------------------------------------------ Linux 3.11-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJSET6HAAoJEHm+PkMAQRiGdIcIAJKtR9Xgg5z3ITrHv5v6Zqc4 nrv46NP6XBL5GJ/CpYdjQUzee4OT+Eiv9YiWkrhLG9dKrwsdxmSGG1bFe0VpaE9E 1VnlZVWqfm7sllKTVq0dn+yrgt/RirNF+vyC5mJ+LnVv3iVqCltOE7W9rRTFxQeg QBP55+2g7lbASVrMxBwN5MyR8/zX9cO2yRQ0742PCYN30dMhueeJO7h6r6Uhwi9e LDYpy4UMVy5hRw8M0j26JNYn1VYiYcv58ezB7iiOn81X1K5K5yMa9cbTgds7tcgH c5zjtBRWzbMLWCTR3Io6h/pF+vgzblMl8piWRiJv0LQJUCLYHZdYMekTxhMBAkc= =w8t8 -----END PGP SIGNATURE----- Linus Lüssing (1): batman-adv: fix potential kernel paging errors for unicast transmissions ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: Merge branch 'next' (429b406)
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 429b406c47d88f0c73e1deb6b0dc1c6eeb867cda Merge: e854b27 03d44fa Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Aug 18 22:07:38 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 429b406c47d88f0c73e1deb6b0dc1c6eeb867cda compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (429b406)
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: e39bc52 batman-adv: fix variable name in compat code 03d44fa Merge branch 'maint' into next 429b406 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (03d44fa)
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 03d44fa676c1a4a8df519536af29d62d95132ea0 Merge: 6944741 e39bc52 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Aug 18 22:06:51 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 03d44fa676c1a4a8df519536af29d62d95132ea0 compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (03d44fa)
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: e39bc52 batman-adv: fix variable name in compat code 03d44fa Merge branch 'maint' into next

1 0

[batman-adv] maint: batman-adv: fix variable name in compat code (e39bc52)
by postmaster＠open-mesh.org 18 Aug '13

18 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit e39bc52671fb33e7d79e58cd5838be75e12abeb8 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Sun Aug 18 12:40:03 2013 +0200 batman-adv: fix variable name in compat code compat code introduced by 0d941e82ab5f92faf33bee6abdde519056f3ac2d ("batman-adv: Unmap fragment page once iterator is done") is declaring a variable having the same name of one used in the batman-adv code. Rename it to prevent sparse warnings. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> >--------------------------------------------------------------- e39bc52671fb33e7d79e58cd5838be75e12abeb8 compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compat.h b/compat.h index 346a824..35ed4d9 100644 --- a/compat.h +++ b/compat.h @@ -309,10 +309,10 @@ static int __batadv_interface_set_mac_addr(x, y) /* older kernels still need to call skb_abort_seq_read() */ #define skb_seq_read(consumed, data, st) \ ({ \ - int len = skb_seq_read(consumed, data, st); \ - if (len == 0) \ + int __len = skb_seq_read(consumed, data, st); \ + if (__len == 0) \ skb_abort_seq_read(st); \ - len; \ + __len; \ }) #endif /* < KERNEL_VERSION(3, 11, 0) */

1 0

[batman-adv] master: Merge branch 'next' (e854b27)
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e854b270a0c1efffa0ec93648640ff5e77a7521c Merge: 2cc9694 6944741 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Aug 18 02:07:20 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- e854b270a0c1efffa0ec93648640ff5e77a7521c compat.h | 8 ++++++++ main.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[batman-adv] master's head updated: Merge branch 'next' (e854b27)
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 0d941e8 batman-adv: Unmap fragment page once iterator is done 6944741 Merge branch 'maint' into next e854b27 Merge branch 'next'

1 0

[batman-adv] next: Merge branch 'maint' into next (6944741)
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 694474198d970956c6293bc4d5f3772c02bb9144 Merge: 74fa2e6 0d941e8 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Aug 18 02:04:26 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 694474198d970956c6293bc4d5f3772c02bb9144 compat.h | 8 ++++++++ main.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[batman-adv] next's head updated: Merge branch 'maint' into next (6944741)
by postmaster＠open-mesh.org 17 Aug '13

17 Aug '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 0d941e8 batman-adv: Unmap fragment page once iterator is done 6944741 Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2013