linux-merge November 2018

linux-merge@lists.open-mesh.org

3 participants
48 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20181116
by batman＠open-mesh.org 16 Nov '18

16 Nov '18

The following commit has been merged in the master branch: commit 95d8f85c911331fc4b4a6039295b3fe1673c73e7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 21 11:30:30 2018 +0200 batman-adv: Improve includes for trace functionality The batadv_dbg trace event uses different functionality and datastructures which are not directly associated with the trace infrastructure. It should not be expected that the trace headers indirectly provide them and instead include the required headers directly. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/trace.c b/net/batman-adv/trace.c index 3d57f9981f25..8e1024217cff 100644 --- a/net/batman-adv/trace.c +++ b/net/batman-adv/trace.c @@ -16,7 +16,5 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <linux/module.h> - #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 3acda26a30ca..104784be94d7 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -21,7 +21,13 @@ #include "main.h" +#include <linux/bug.h> +#include <linux/kernel.h> +#include <linux/netdevice.h> +#include <linux/percpu.h> +#include <linux/printk.h> #include <linux/tracepoint.h> +#include <linux/types.h> #undef TRACE_SYSTEM #define TRACE_SYSTEM batadv -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20181116
by batman＠open-mesh.org 16 Nov '18

16 Nov '18

The following commit has been merged in the master branch: commit 01468225f305f3607868171b1abc2929a4501fad Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Oct 21 11:30:28 2018 +0200 batman-adv: Drop unused lockdep include The commit dee222c7b20c ("batman-adv: Move OGM rebroadcast stats to orig_ifinfo") removed all used functionality of the include linux/lockdep.h from batadv_iv_ogm.c. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index d2227091029f..1d31ac84dec7 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -34,7 +34,6 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20181116
by batman＠open-mesh.org 16 Nov '18

16 Nov '18

The following commit has been merged in the master branch: commit 3987b6a4ccf849c3e2b3d581a22ebf55eae995cb Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Nov 5 07:11:52 2018 +0100 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 2002b70e18db..b68a41190eb0 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.4" +#define BATADV_SOURCE_VERSION "2019.0" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

Build check errors found: 2018-11-16
by postmaster＠open-mesh.org 16 Nov '18

16 Nov '18

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/bat_v_elp.c | 6 ++---- net/net/batman-adv/fragmentation.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/Kconfig | 10 - netnext/net/batman-adv/bat_iv_ogm.c | 25 +--- netnext/net/batman-adv/bat_v.c | 26 +---- netnext/net/batman-adv/bat_v_elp.c | 6 - netnext/net/batman-adv/bridge_loop_avoidance.c | 82 +++++++--------- netnext/net/batman-adv/debugfs.c | 2 netnext/net/batman-adv/distributed-arp-table.c | 42 +++----- netnext/net/batman-adv/fragmentation.c | 2 netnext/net/batman-adv/gateway_client.c | 3 netnext/net/batman-adv/hard-interface.c | 3 netnext/net/batman-adv/hash.c | 2 netnext/net/batman-adv/hash.h | 6 - netnext/net/batman-adv/log.c | 60 +++++------ netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/main.h | 3 netnext/net/batman-adv/multicast.c | 51 ++++----- netnext/net/batman-adv/netlink.c | 24 +--- netnext/net/batman-adv/trace.c | 2 netnext/net/batman-adv/trace.h | 6 - netnext/net/batman-adv/translation-table.c | 41 +++----- netnext/net/batman-adv/types.h | 5 21 files changed, 163 insertions(+), 241 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 52 Tested Linux versions: 26 Tested configs: 51 master ------ Failed tests: 1 Started build tests: 51 Tested Linux versions: 24 Tested configs: 47

1 0

Build check errors found: 2018-11-15
by postmaster＠open-mesh.org 15 Nov '18

15 Nov '18

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/bat_v_elp.c | 6 ++---- net/net/batman-adv/fragmentation.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/Kconfig | 10 - netnext/net/batman-adv/bat_iv_ogm.c | 25 +--- netnext/net/batman-adv/bat_v.c | 26 +---- netnext/net/batman-adv/bat_v_elp.c | 6 - netnext/net/batman-adv/bridge_loop_avoidance.c | 82 +++++++--------- netnext/net/batman-adv/debugfs.c | 2 netnext/net/batman-adv/distributed-arp-table.c | 42 +++----- netnext/net/batman-adv/fragmentation.c | 2 netnext/net/batman-adv/gateway_client.c | 3 netnext/net/batman-adv/hard-interface.c | 3 netnext/net/batman-adv/hash.c | 2 netnext/net/batman-adv/hash.h | 6 - netnext/net/batman-adv/log.c | 60 +++++------ netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/main.h | 3 netnext/net/batman-adv/multicast.c | 51 ++++----- netnext/net/batman-adv/netlink.c | 24 +--- netnext/net/batman-adv/trace.c | 2 netnext/net/batman-adv/trace.h | 6 - netnext/net/batman-adv/translation-table.c | 41 +++----- netnext/net/batman-adv/types.h | 5 21 files changed, 163 insertions(+), 241 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 54 Tested Linux versions: 26 Tested configs: 46 master ------ Failed tests: 1 Started build tests: 51 Tested Linux versions: 26 Tested configs: 46

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 14 Nov '18

14 Nov '18

Your request for analysis of batctl has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Build ID: 237404 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 14 Nov '18

14 Nov '18

Your request for analysis of alfred has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Build ID: 237403 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Build check errors found: 2018-11-14
by postmaster＠open-mesh.org 14 Nov '18

14 Nov '18

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master * headers Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/Kconfig | 11 net/net/batman-adv/Makefile | 3 net/net/batman-adv/bat_iv_ogm.c | 330 +++++++-------------------- net/net/batman-adv/bat_v_elp.c | 6 net/net/batman-adv/debugfs.c | 37 +++ net/net/batman-adv/debugfs.h | 6 net/net/batman-adv/fragmentation.c | 2 net/net/batman-adv/hard-interface.c | 47 ++- net/net/batman-adv/icmp_socket.c | 3 net/net/batman-adv/log.c | 20 + net/net/batman-adv/main.h | 2 net/net/batman-adv/originator.c | 107 -------- net/net/batman-adv/originator.h | 4 net/net/batman-adv/soft-interface.c | 2 net/net/batman-adv/trace.c | 22 + net/net/batman-adv/trace.h | 78 ++++++ net/net/batman-adv/types.h | 62 +---- 17 files changed, 326 insertions(+), 416 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- netnext/net/batman-adv/fragmentation.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) master: headers --------------- diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1545195..ab4cee9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -34,7 +34,6 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 9858900..8f87f6a 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -19,6 +19,7 @@ #include "debugfs.h" #include "main.h" // IWYU pragma: keep +#include <asm/current.h> #include <linux/dcache.h> #include <linux/debugfs.h> #include <linux/err.h> @@ -27,6 +28,7 @@ #include <linux/fs.h> #include <linux/netdevice.h> #include <linux/printk.h> +#include <linux/sched.h> #include <linux/seq_file.h> #include <linux/stat.h> #include <linux/stddef.h> diff --git a/net/batman-adv/trace.c b/net/batman-adv/trace.c index 3d57f99..8e10242 100644 --- a/net/batman-adv/trace.c +++ b/net/batman-adv/trace.c @@ -16,7 +16,5 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <linux/module.h> - #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 1dccc82..f9637a6 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -74,5 +74,11 @@ TRACE_EVENT(batadv_dbg, #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace +#include <linux/bug.h> +#include <linux/kernel.h> +#include <linux/netdevice.h> +#include <linux/percpu.h> +#include <linux/printk.h> +#include <linux/types.h> /* This part must be outside protection */ #include <trace/define_trace.h> Statistics ========== maint ----- Failed tests: 1 Started build tests: 52 Tested Linux versions: 23 Tested configs: 47 master ------ Failed tests: 2 Started build tests: 52 Tested Linux versions: 24 Tested configs: 45

1 0

Build check errors found: 2018-11-13
by postmaster＠open-mesh.org 13 Nov '18

13 Nov '18

Name of failed tests ==================== master ------ * difference between net-next and batadv master * headers maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/Kconfig | 11 net/net/batman-adv/Makefile | 3 net/net/batman-adv/bat_iv_ogm.c | 330 +++++++-------------------- net/net/batman-adv/bat_v_elp.c | 6 net/net/batman-adv/debugfs.c | 37 +++ net/net/batman-adv/debugfs.h | 6 net/net/batman-adv/fragmentation.c | 2 net/net/batman-adv/hard-interface.c | 47 ++- net/net/batman-adv/icmp_socket.c | 3 net/net/batman-adv/log.c | 20 + net/net/batman-adv/main.h | 2 net/net/batman-adv/originator.c | 107 -------- net/net/batman-adv/originator.h | 4 net/net/batman-adv/soft-interface.c | 2 net/net/batman-adv/trace.c | 22 + net/net/batman-adv/trace.h | 78 ++++++ net/net/batman-adv/types.h | 62 +---- 17 files changed, 326 insertions(+), 416 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- netnext/net/batman-adv/fragmentation.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) master: headers --------------- diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1545195..ab4cee9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -34,7 +34,6 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index 9858900..8f87f6a 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -19,6 +19,7 @@ #include "debugfs.h" #include "main.h" // IWYU pragma: keep +#include <asm/current.h> #include <linux/dcache.h> #include <linux/debugfs.h> #include <linux/err.h> @@ -27,6 +28,7 @@ #include <linux/fs.h> #include <linux/netdevice.h> #include <linux/printk.h> +#include <linux/sched.h> #include <linux/seq_file.h> #include <linux/stat.h> #include <linux/stddef.h> diff --git a/net/batman-adv/trace.c b/net/batman-adv/trace.c index 3d57f99..8e10242 100644 --- a/net/batman-adv/trace.c +++ b/net/batman-adv/trace.c @@ -16,7 +16,5 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <linux/module.h> - #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 1dccc82..f9637a6 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -74,5 +74,11 @@ TRACE_EVENT(batadv_dbg, #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace +#include <linux/bug.h> +#include <linux/kernel.h> +#include <linux/netdevice.h> +#include <linux/percpu.h> +#include <linux/printk.h> +#include <linux/types.h> /* This part must be outside protection */ #include <trace/define_trace.h> Statistics ========== master ------ Failed tests: 2 Started build tests: 47 Tested Linux versions: 21 Tested configs: 42 maint ----- Failed tests: 1 Started build tests: 53 Tested Linux versions: 25 Tested configs: 50

1 0

Coverity Scan: Analysis completed for batman-adv-maint
by scan-admin＠coverity.com 13 Nov '18

13 Nov '18

Your request for analysis of batman-adv-maint has been completed successfully. The results are available at https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V0… Build ID: 237060 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2018