linux-merge March 2016

linux-merge@lists.open-mesh.org

3 participants
83 discussions

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 18 Mar '16

18 Mar '16

--- batman-adv_maint.packet.h 2016-03-19 00:05:01.694635035 +0100 +++ batctl_maint.packet.h 2016-03-19 00:05:01.702635507 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-18
by postmaster＠open-mesh.org 18 Mar '16

18 Mar '16

Name of failed tests ==================== * checkpatch master ./net/batman-adv/fragmentation.c * checkpatch next ./net/batman-adv/fragmentation.c * difference between net-next and batadv next * headers master * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n Output of different failed tests ================================ checkpatch next ./net/batman-adv/fragmentation.c ------------------------------------------------ WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #410: FILE: ./net/batman-adv/fragmentation.c:410: + unsigned header_size = sizeof(*frag_head); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #411: FILE: ./net/batman-adv/fragmentation.c:411: + unsigned fragment_size = mtu - header_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #447: FILE: ./net/batman-adv/fragmentation.c:447: + unsigned mtu = neigh_node->if_incoming->net_dev->mtu; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #448: FILE: ./net/batman-adv/fragmentation.c:448: + unsigned header_size = sizeof(frag_header); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #449: FILE: ./net/batman-adv/fragmentation.c:449: + unsigned max_fragment_size, max_packet_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #455: FILE: ./net/batman-adv/fragmentation.c:455: + mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); total: 0 errors, 6 warnings, 0 checks, 516 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 93377f4..ef8b32f 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d9c5f17..2005aa6 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" // IWYU pragma: keep - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" // IWYU pragma: keep struct net_device; struct sk_buff; smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y --------------------------------------------------------------------------- /home/build_test/build_env/tmp/net/batman-adv/routing.c:593 batadv_route_unicast_packet warn: unused return: ethhdr = eth_hdr()

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 17 Mar '16

17 Mar '16

--- batman-adv_maint.packet.h 2016-03-18 00:05:01.689855206 +0100 +++ batctl_maint.packet.h 2016-03-18 00:05:01.697855740 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-17
by postmaster＠open-mesh.org 17 Mar '16

17 Mar '16

Name of failed tests ==================== * checkpatch master ./net/batman-adv/fragmentation.c * checkpatch next ./net/batman-adv/fragmentation.c * difference between net-next and batadv next * headers master * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y Output of different failed tests ================================ checkpatch next ./net/batman-adv/fragmentation.c ------------------------------------------------ WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #410: FILE: ./net/batman-adv/fragmentation.c:410: + unsigned header_size = sizeof(*frag_head); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #411: FILE: ./net/batman-adv/fragmentation.c:411: + unsigned fragment_size = mtu - header_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #447: FILE: ./net/batman-adv/fragmentation.c:447: + unsigned mtu = neigh_node->if_incoming->net_dev->mtu; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #448: FILE: ./net/batman-adv/fragmentation.c:448: + unsigned header_size = sizeof(frag_header); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #449: FILE: ./net/batman-adv/fragmentation.c:449: + unsigned max_fragment_size, max_packet_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #455: FILE: ./net/batman-adv/fragmentation.c:455: + mtu = min_t(unsigned, mtu, BATADV_FRAG_MAX_FRAG_SIZE); total: 0 errors, 6 warnings, 0 checks, 516 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 93377f4..ef8b32f 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d9c5f17..2005aa6 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" // IWYU pragma: keep - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" // IWYU pragma: keep struct net_device; struct sk_buff; smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n --------------------------------------------------------------------------- /home/build_test/build_env/tmp/net/batman-adv/routing.c:593 batadv_route_unicast_packet warn: unused return: ethhdr = eth_hdr()

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 16 Mar '16

16 Mar '16

--- batman-adv_maint.packet.h 2016-03-17 00:05:01.336256341 +0100 +++ batctl_maint.packet.h 2016-03-17 00:05:01.344256877 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-16
by postmaster＠open-mesh.org 16 Mar '16

16 Mar '16

Name of failed tests ==================== * checkpatch master ./net/batman-adv/fragmentation.c * checkpatch next ./net/batman-adv/fragmentation.c * difference between net-next and batadv next * headers master * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n Output of different failed tests ================================ checkpatch next ./net/batman-adv/fragmentation.c ------------------------------------------------ WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #410: FILE: ./net/batman-adv/fragmentation.c:410: + unsigned header_size = sizeof(*frag_head); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #411: FILE: ./net/batman-adv/fragmentation.c:411: + unsigned fragment_size = mtu - header_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #447: FILE: ./net/batman-adv/fragmentation.c:447: + unsigned mtu = neigh_node->if_incoming->net_dev->mtu; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #448: FILE: ./net/batman-adv/fragmentation.c:448: + unsigned header_size = sizeof(frag_header); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #449: FILE: ./net/batman-adv/fragmentation.c:449: + unsigned max_fragment_size, max_packet_size; total: 0 errors, 5 warnings, 0 checks, 516 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 93377f4..ef8b32f 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d9c5f17..2005aa6 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" // IWYU pragma: keep - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" // IWYU pragma: keep struct net_device; struct sk_buff; smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=n --------------------------------------------------------------------------- /home/build_test/build_env/tmp/net/batman-adv/routing.c:593 batadv_route_unicast_packet warn: unused return: ethhdr = eth_hdr()

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 15 Mar '16

15 Mar '16

--- batman-adv_maint.packet.h 2016-03-16 00:05:01.760261771 +0100 +++ batctl_maint.packet.h 2016-03-16 00:05:01.768262307 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-15
by postmaster＠open-mesh.org 15 Mar '16

15 Mar '16

Name of failed tests ==================== * checkpatch master ./net/batman-adv/fragmentation.c * checkpatch next ./net/batman-adv/fragmentation.c * difference between net-next and batadv next * headers master * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=n CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch master linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=n * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=n CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y * smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y Output of different failed tests ================================ checkpatch next ./net/batman-adv/fragmentation.c ------------------------------------------------ WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #410: FILE: ./net/batman-adv/fragmentation.c:410: + unsigned header_size = sizeof(*frag_head); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #411: FILE: ./net/batman-adv/fragmentation.c:411: + unsigned fragment_size = mtu - header_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #447: FILE: ./net/batman-adv/fragmentation.c:447: + unsigned mtu = neigh_node->if_incoming->net_dev->mtu; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #448: FILE: ./net/batman-adv/fragmentation.c:448: + unsigned header_size = sizeof(frag_header); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #449: FILE: ./net/batman-adv/fragmentation.c:449: + unsigned max_fragment_size, max_packet_size; total: 0 errors, 5 warnings, 0 checks, 516 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 93377f4..ef8b32f 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d9c5f17..2005aa6 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" // IWYU pragma: keep - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" // IWYU pragma: keep struct net_device; struct sk_buff; smatch next linux-4.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=y CONFIG_BATMAN_ADV_NC=y CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_BATMAN_V=y --------------------------------------------------------------------------- /home/build_test/build_env/tmp/net/batman-adv/routing.c:593 batadv_route_unicast_packet warn: unused return: ethhdr = eth_hdr()

1 0

Noticed difference in packet.h in maint.diff
by postmaster＠open-mesh.org 14 Mar '16

14 Mar '16

--- batman-adv_maint.packet.h 2016-03-15 00:05:01.662628596 +0100 +++ batctl_maint.packet.h 2016-03-15 00:05:01.670629196 +0100 @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich *

1 0

Build check errors found: 2016-03-14
by postmaster＠open-mesh.org 14 Mar '16

14 Mar '16

Name of failed tests ==================== * checkpatch master ./net/batman-adv/fragmentation.c * checkpatch next ./net/batman-adv/fragmentation.c * difference between net-next and batadv next * headers master Output of different failed tests ================================ checkpatch next ./net/batman-adv/fragmentation.c ------------------------------------------------ WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #410: FILE: ./net/batman-adv/fragmentation.c:410: + unsigned header_size = sizeof(*frag_head); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #411: FILE: ./net/batman-adv/fragmentation.c:411: + unsigned fragment_size = mtu - header_size; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #447: FILE: ./net/batman-adv/fragmentation.c:447: + unsigned mtu = neigh_node->if_incoming->net_dev->mtu; WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #448: FILE: ./net/batman-adv/fragmentation.c:448: + unsigned header_size = sizeof(frag_header); WARNING: Prefer 'unsigned int' to bare use of 'unsigned' #449: FILE: ./net/batman-adv/fragmentation.c:449: + unsigned max_fragment_size, max_packet_size; total: 0 errors, 5 warnings, 0 checks, 516 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/Kconfig | 2 +- net/batman-adv/bat_iv_ogm.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) headers master -------------- diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index 93377f4..ef8b32f 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/bitops.h> +#include <linux/stddef.h> #include <linux/compiler.h> #include <linux/types.h> diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index d9c5f17..2005aa6 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,9 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" // IWYU pragma: keep - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h" // IWYU pragma: keep struct net_device; struct sk_buff;

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge March 2016