[batman-adv] master: batman-adv: Add new include for min/max helpers (1810de05)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 1810de05310d5c5e9140f870ac21052f38bc06b8
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Oct 26 22:01:41 2020 +0100
batman-adv: Add new include for min/max helpers
The commit b296a6d53339 ("kernel.h: split out min()/max() et al. helpers")
moved the min/max helper functionality from kernel.h to minmax.h. Adjust
the kernel code accordingly to avoid fragile indirect includes.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
1810de05310d5c5e9140f870ac21052f38bc06b8
compat-include/linux/{build_bug.h => minmax.h} | 12 ++++++------
net/batman-adv/bat_v.c | 1 +
net/batman-adv/bat_v_elp.c | 1 +
net/batman-adv/bat_v_ogm.c | 1 +
net/batman-adv/fragmentation.c | 2 +-
net/batman-adv/hard-interface.c | 1 +
net/batman-adv/icmp_socket.c | 1 +
net/batman-adv/main.c | 1 +
net/batman-adv/netlink.c | 1 +
net/batman-adv/tp_meter.c | 1 +
10 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/compat-include/linux/build_bug.h b/compat-include/linux/minmax.h
similarity index 53%
copy from compat-include/linux/build_bug.h
copy to compat-include/linux/minmax.h
index 5996d9e7..4b19479b 100644
--- a/compat-include/linux/build_bug.h
+++ b/compat-include/linux/minmax.h
@@ -7,14 +7,14 @@
* of the Linux kernel.
*/
-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_
-#define _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_
+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
+#define _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_
#include <linux/version.h>
-#if LINUX_VERSION_IS_GEQ(4, 13, 0)
-#include_next <linux/build_bug.h>
+#if LINUX_VERSION_IS_GEQ(5, 10, 0)
+#include_next <linux/minmax.h>
#else
-#include <linux/bug.h>
+#include <linux/kernel.h>
#endif
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_ */
+#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_MINMAX_H_ */
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 0ecaf1bb..e91d2c07 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -16,6 +16,7 @@
#include <linux/kernel.h>
#include <linux/kref.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/netdevice.h>
#include <linux/netlink.h>
#include <linux/rculist.h>
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 79a7dfc3..0512ea6c 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -18,6 +18,7 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/kref.h>
+#include <linux/minmax.h>
#include <linux/netdevice.h>
#include <linux/nl80211.h>
#include <linux/prandom.h>
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index 8c1148fc..798d6598 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -18,6 +18,7 @@
#include <linux/kref.h>
#include <linux/list.h>
#include <linux/lockdep.h>
+#include <linux/minmax.h>
#include <linux/mutex.h>
#include <linux/netdevice.h>
#include <linux/prandom.h>
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index 9a47ef8b..97220e19 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -14,8 +14,8 @@
#include <linux/gfp.h>
#include <linux/if_ether.h>
#include <linux/jiffies.h>
-#include <linux/kernel.h>
#include <linux/lockdep.h>
+#include <linux/minmax.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/slab.h>
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index dad99641..a28fb9ab 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -18,6 +18,7 @@
#include <linux/kref.h>
#include <linux/limits.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/mutex.h>
#include <linux/netdevice.h>
#include <linux/printk.h>
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 8bdabc03..56de4bf2 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -20,6 +20,7 @@
#include <linux/if_ether.h>
#include <linux/kernel.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/pkt_sched.h>
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 70fee9b4..293c62ed 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -23,6 +23,7 @@
#include <linux/kobject.h>
#include <linux/kref.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/printk.h>
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index c7a55647..97bcf149 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -23,6 +23,7 @@
#include <linux/kernel.h>
#include <linux/limits.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/netdevice.h>
#include <linux/netlink.h>
#include <linux/printk.h>
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index db7e3774..d4e10005 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -23,6 +23,7 @@
#include <linux/kthread.h>
#include <linux/limits.h>
#include <linux/list.h>
+#include <linux/minmax.h>
#include <linux/netdevice.h>
#include <linux/param.h>
#include <linux/printk.h>
3 months
[batman-adv] master: batman-adv: Move next release to 2021 (69bbc8fc)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 69bbc8fcf717b0baae462657a3ccc3e1b0b9c62a
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Oct 27 15:08:32 2020 +0100
batman-adv: Move next release to 2021
The first possible release day for the next release is in the last week of
december. But it can also happen that another rc8 will be added by Linus
Torvalds - and thus the release will be postponed to 2021. Just avoid this
uncertainty in the version number by directly going to 2021.0 and not doing
a feature release this year.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
69bbc8fcf717b0baae462657a3ccc3e1b0b9c62a
net/batman-adv/main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index cc9fe5f3..9254c6ee 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -13,7 +13,7 @@
#define BATADV_DRIVER_DEVICE "batman-adv"
#ifndef BATADV_SOURCE_VERSION
-#define BATADV_SOURCE_VERSION "2020.5"
+#define BATADV_SOURCE_VERSION "2021.0"
#endif
/* B.A.T.M.A.N. parameters */
3 months
[batctl] master: batctl: Move next release to 2021 (d985e88)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit d985e88f8bc8ef24aa799e155c3084b3b78badc1
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Oct 27 15:08:29 2020 +0100
batctl: Move next release to 2021
The first possible release day for the next release is in the last week of
december. But it can also happen that another rc8 will be added by Linus
Torvalds - and thus the release will be postponed to 2021. Just avoid this
uncertainty in the version number by directly going to 2021.0 and not doing
a feature release this year.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
d985e88f8bc8ef24aa799e155c3084b3b78badc1
main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.h b/main.h
index 2c0c46d..a53acc8 100644
--- a/main.h
+++ b/main.h
@@ -17,7 +17,7 @@
#include <netlink/netlink.h>
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.5"
+#define SOURCE_VERSION "2021.0"
#endif
#define EXIT_NOSUCCESS 2
3 months
[alfred] master: alfred: Move next release to 2021 (dece44c)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit dece44cf5626f921b5803273c8e05de7684fb6bf
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Tue Oct 27 15:08:38 2020 +0100
alfred: Move next release to 2021
The first possible release day for the next release is in the last week of
december. But it can also happen that another rc8 will be added by Linus
Torvalds - and thus the release will be postponed to 2021. Just avoid this
uncertainty in the version number by directly going to 2021.0 and not doing
a feature release this year.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
dece44cf5626f921b5803273c8e05de7684fb6bf
alfred.h | 2 +-
gpsd/alfred-gpsd.h | 2 +-
vis/vis.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/alfred.h b/alfred.h
index d544a33..a61365d 100644
--- a/alfred.h
+++ b/alfred.h
@@ -7,7 +7,7 @@
*/
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.5"
+#define SOURCE_VERSION "2021.0"
#endif
#include <net/ethernet.h>
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index e5ac026..b5452b4 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -25,7 +25,7 @@
#include "../list.h"
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.5"
+#define SOURCE_VERSION "2021.0"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
diff --git a/vis/vis.h b/vis/vis.h
index daac4f8..43d2974 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -14,7 +14,7 @@
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.5"
+#define SOURCE_VERSION "2021.0"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
3 months
[alfred] tag 'v2020.4' created
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/alfred
New tag : v2020.4
Referencing: 9d6cd2213b72f88a02ca91996ad5329cf43a6fcb
3 months
[alfred] master: alfred: Update CHANGELOG for upcoming release (7b53b13)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit 7b53b13046db1f2893291a70a53d1eb9b54f85e7
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Tue Oct 27 11:55:09 2020 +0100
alfred: Update CHANGELOG for upcoming release
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
7b53b13046db1f2893291a70a53d1eb9b54f85e7
CHANGELOG.rst | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 532c0b2..eb98fa8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,10 @@
.. SPDX-License-Identifier: GPL-2.0
+2020.4 (2020-10-27)
+===================
+
+* (no changes)
+
2020.3 (2020-08-24)
===================
3 months
[alfred] master: alfred: Start new development cycle (27b8d81)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit 27b8d81a576f981735a4eeeabc332861732519b0
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Tue Oct 27 11:55:35 2020 +0100
alfred: Start new development cycle
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
27b8d81a576f981735a4eeeabc332861732519b0
alfred.h | 2 +-
gpsd/alfred-gpsd.h | 2 +-
vis/vis.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/alfred.h b/alfred.h
index e3470f3..d544a33 100644
--- a/alfred.h
+++ b/alfred.h
@@ -7,7 +7,7 @@
*/
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.4"
+#define SOURCE_VERSION "2020.5"
#endif
#include <net/ethernet.h>
diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h
index 23d11cb..e5ac026 100644
--- a/gpsd/alfred-gpsd.h
+++ b/gpsd/alfred-gpsd.h
@@ -25,7 +25,7 @@
#include "../list.h"
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.4"
+#define SOURCE_VERSION "2020.5"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
diff --git a/vis/vis.h b/vis/vis.h
index 256ad89..daac4f8 100644
--- a/vis/vis.h
+++ b/vis/vis.h
@@ -14,7 +14,7 @@
#ifndef SOURCE_VERSION
-#define SOURCE_VERSION "2020.4"
+#define SOURCE_VERSION "2020.5"
#endif
#define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"
3 months
[batctl] tag 'v2020.4' created
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batctl
New tag : v2020.4
Referencing: 856e1c2d460eea72c442d58e7dafd3db37cabe66
3 months
[batctl] master: batctl: Update CHANGELOG for upcoming release (7060fb1)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit 7060fb117bb1736222019ea1afb730fcede3974b
Author: Simon Wunderlich <sw(a)simonwunderlich.de>
Date: Tue Oct 27 11:53:21 2020 +0100
batctl: Update CHANGELOG for upcoming release
Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de>
>---------------------------------------------------------------
7060fb117bb1736222019ea1afb730fcede3974b
CHANGELOG.rst | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index eb371fb..e704feb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,12 @@
.. SPDX-License-Identifier: GPL-2.0
+2020.4 (2020-10-27)
+===================
+
+* bugs squashed:
+
+ - Fix endianness in ICMPv6 Echo Request/Reply parsing
+
2020.3 (2020-08-24)
===================
3 months