linux-merge November 2018

linux-merge@lists.open-mesh.org

3 participants
48 discussions

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

12 Nov '18

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

1 0

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

12 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: 54 Tested Linux versions: 25 Tested configs: 51 master ------ Failed tests: 2 Started build tests: 52 Tested Linux versions: 26 Tested configs: 49

1 0

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

11 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: 54 Tested Linux versions: 24 Tested configs: 45 master ------ Failed tests: 2 Started build tests: 52 Tested Linux versions: 23 Tested configs: 47

1 0

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

10 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/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 +---- 16 files changed, 325 insertions(+), 415 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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: 55 Tested Linux versions: 24 Tested configs: 48 master ------ Failed tests: 2 Started build tests: 51 Tested Linux versions: 26 Tested configs: 46

1 0

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

09 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/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 +---- 16 files changed, 325 insertions(+), 415 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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: 54 Tested Linux versions: 27 Tested configs: 47 master ------ Failed tests: 2 Started build tests: 50 Tested Linux versions: 26 Tested configs: 44

1 0

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

08 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/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 +---- 16 files changed, 325 insertions(+), 415 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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: 49 master ------ Failed tests: 2 Started build tests: 51 Tested Linux versions: 25 Tested configs: 48

1 0

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

07 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: 236265 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

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

07 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/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 +---- 16 files changed, 325 insertions(+), 415 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v_elp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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: 54 Tested Linux versions: 22 Tested configs: 50 master ------ Failed tests: 2 Started build tests: 50 Tested Linux versions: 22 Tested configs: 44

1 0

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

06 Nov '18

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

1 0

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

06 Nov '18

Name of failed tests ==================== master ------ * difference between net 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/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 +---- 16 files changed, 325 insertions(+), 415 deletions(-) master: difference between net and batadv master ------------------------------------------------ netnext/net/batman-adv/bat_v_elp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 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: 51 Tested Linux versions: 24 Tested configs: 44 maint ----- Failed tests: 1 Started build tests: 55 Tested Linux versions: 26 Tested configs: 49

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2018