Name of failed tests ====================
maint -----
* difference between net and batadv maint
master ------
* checkpatch ./net/batman-adv/bridge_loop_avoidance.c * checkpatch ./net/batman-adv/fragmentation.c * checkpatch ./net/batman-adv/hard-interface.c * checkpatch ./net/batman-adv/multicast.c * checkpatch ./net/batman-adv/network-coding.c * checkpatch ./net/batman-adv/send.c * checkpatch ./net/batman-adv/soft-interface.c * checkpatch ./net/batman-adv/types.h * difference between net-next and batadv master * headers
Output of different failed tests ================================
master: checkpatch ./net/batman-adv/bridge_loop_avoidance.c -----------------------------------------------------------
WARNING: Possible repeated word: 'function' #1801: FILE: ./net/batman-adv/bridge_loop_avoidance.c:1801: + /* backbone_gw is unreferenced in the report work function function
total: 0 errors, 1 warnings, 0 checks, 2547 lines checked
master: checkpatch ./net/batman-adv/fragmentation.c ---------------------------------------------------
WARNING: Possible repeated word: 'not' #309: FILE: ./net/batman-adv/fragmentation.c:309: + * Return: true when the packet is merged or buffered, false when skb is not not
total: 0 errors, 1 warnings, 0 checks, 548 lines checked
master: checkpatch ./net/batman-adv/hard-interface.c ----------------------------------------------------
WARNING: Possible repeated word: 'table' #602: FILE: ./net/batman-adv/hard-interface.c:602: + * maximum local table table size
total: 0 errors, 1 warnings, 0 checks, 1098 lines checked
master: checkpatch ./net/batman-adv/multicast.c -----------------------------------------------
WARNING: Possible repeated word: 'multicast' #210: FILE: ./net/batman-adv/multicast.c:210: + * is capable of performing proper RFC4286 multicast multicast router
total: 0 errors, 1 warnings, 0 checks, 2430 lines checked
master: checkpatch ./net/batman-adv/network-coding.c ----------------------------------------------------
WARNING: Possible repeated word: 'is' #253: FILE: ./net/batman-adv/network-coding.c:253: + * @dropped: whether the packet is freed because is is dropped
total: 0 errors, 1 warnings, 0 checks, 1962 lines checked
master: checkpatch ./net/batman-adv/send.c ------------------------------------------
WARNING: Possible repeated word: 'is' #464: FILE: ./net/batman-adv/send.c:464: + * @dropped: whether the packet is freed because is is dropped
total: 0 errors, 1 warnings, 0 checks, 1002 lines checked
master: checkpatch ./net/batman-adv/soft-interface.c ----------------------------------------------------
WARNING: Possible repeated word: 'the' #652: FILE: ./net/batman-adv/soft-interface.c:652: + * @proto: protocol of the the vlan id
WARNING: Possible repeated word: 'the' #710: FILE: ./net/batman-adv/soft-interface.c:710: + * @proto: protocol of the the vlan id
total: 0 errors, 2 warnings, 0 checks, 1180 lines checked
master: checkpatch ./net/batman-adv/types.h -------------------------------------------
WARNING: Possible repeated word: 'time' #1495: FILE: ./net/batman-adv/types.h:1495: + /** @last_recv_time: time time (jiffies) a msg was received */
WARNING: Possible repeated word: 'address' #1999: FILE: ./net/batman-adv/types.h:1999: + * @addr: mac address address of the originator this request was sent to
total: 0 errors, 2 warnings, 0 checks, 2476 lines checked
maint: difference between net and batadv maint ----------------------------------------------
net/Documentation/networking/batman-adv.rst | 8 ++-- net/include/uapi/linux/batman_adv.h | 7 ++- net/net/batman-adv/bat_iv_ogm.c | 25 ++++++------ net/net/batman-adv/bat_v_elp.c | 10 ++--- net/net/batman-adv/bat_v_ogm.c | 38 +++++++++++-------- net/net/batman-adv/bridge_loop_avoidance.c | 11 ++--- net/net/batman-adv/distributed-arp-table.c | 2 - net/net/batman-adv/fragmentation.c | 6 +-- net/net/batman-adv/gateway_client.c | 6 +-- net/net/batman-adv/hard-interface.c | 16 ++++---- net/net/batman-adv/log.h | 6 +-- net/net/batman-adv/main.c | 2 - net/net/batman-adv/main.h | 8 ++-- net/net/batman-adv/multicast.c | 21 +++++----- net/net/batman-adv/netlink.c | 14 ++++++- net/net/batman-adv/network-coding.c | 14 +++---- net/net/batman-adv/originator.c | 8 ++-- net/net/batman-adv/routing.c | 4 +- net/net/batman-adv/send.c | 4 +- net/net/batman-adv/soft-interface.c | 2 - net/net/batman-adv/tp_meter.c | 12 +++--- net/net/batman-adv/translation-table.c | 10 ++--- net/net/batman-adv/tvlv.c | 4 +- net/net/batman-adv/types.h | 18 ++++++--- 24 files changed, 139 insertions(+), 117 deletions(-)
master: difference between net-next and batadv master -----------------------------------------------------
netnext/net/batman-adv/bat_v_ogm.c | 11 +++++------ netnext/net/batman-adv/bridge_loop_avoidance.c | 5 +---- netnext/net/batman-adv/gateway_client.c | 6 ++---- 3 files changed, 8 insertions(+), 14 deletions(-)
master: headers ---------------
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index d3aab104..4dca3f04 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -27,6 +27,7 @@ #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/pkt_sched.h> +#include <linux/prandom.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index b8ec89da..a194996f 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -20,6 +20,7 @@ #include <linux/kref.h> #include <linux/netdevice.h> #include <linux/nl80211.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 1e9ddf61..8d52bcb2 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -20,6 +20,7 @@ #include <linux/lockdep.h> #include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index cecf4f99..3b61cebd 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -6,7 +6,6 @@
#include "bridge_loop_avoidance.h" #include "main.h" // IWYU pragma: keep - #include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> @@ -43,6 +42,7 @@
#include "hard-interface.h" #include "hash.h" +#include "linux/preempt.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index b3d947e8..e9a91e77 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -26,8 +26,8 @@ #include <linux/lockdep.h> #include <linux/net.h> #include <linux/netdevice.h> +#include <linux/prandom.h> #include <linux/printk.h> -#include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/seq_file.h>
Statistics ==========
maint -----
Failed tests: 1 Started build tests: 283 Tested Linux versions: 34 Tested configs: 217
master ------
Failed tests: 10 Started build tests: 296 Tested Linux versions: 34 Tested configs: 222
linux-merge@lists.open-mesh.org