Name of failed tests ====================
master ------
* checkpatch ./net/batman-adv/main.h * difference between net and batadv master * headers
maint -----
* difference between net and batadv maint
Output of different failed tests ================================
master: checkpatch ./net/batman-adv/main.h ------------------------------------------
WARNING: Statements should start on a tabstop #335: FILE: ./net/batman-adv/main.h:335: + typeof(y)_d2 = (y); \
WARNING: Statements should start on a tabstop #336: FILE: ./net/batman-adv/main.h:336: + typeof(x)_dummy = (_d1 - _d2); \
total: 0 errors, 2 warnings, 0 checks, 395 lines checked
maint: difference between net and batadv maint ----------------------------------------------
net/Documentation/networking/batman-adv.rst | 2 net/MAINTAINERS | 1 net/include/uapi/linux/batman_adv.h | 27 net/net/batman-adv/Kconfig | 17 net/net/batman-adv/Makefile | 2 net/net/batman-adv/bat_algo.c | 35 net/net/batman-adv/bat_algo.h | 1 net/net/batman-adv/bat_iv_ogm.c | 107 - net/net/batman-adv/bat_iv_ogm.h | 1 net/net/batman-adv/bat_v.c | 51 net/net/batman-adv/bat_v.h | 1 net/net/batman-adv/bat_v_elp.c | 29 net/net/batman-adv/bat_v_elp.h | 1 net/net/batman-adv/bat_v_ogm.c | 39 net/net/batman-adv/bat_v_ogm.h | 1 net/net/batman-adv/bitarray.c | 3 net/net/batman-adv/bitarray.h | 10 net/net/batman-adv/bridge_loop_avoidance.c | 114 - net/net/batman-adv/bridge_loop_avoidance.h | 5 net/net/batman-adv/debugfs.c | 30 net/net/batman-adv/debugfs.h | 1 net/net/batman-adv/distributed-arp-table.c | 80 net/net/batman-adv/distributed-arp-table.h | 9 net/net/batman-adv/fragmentation.c | 28 net/net/batman-adv/fragmentation.h | 3 net/net/batman-adv/gateway_client.c | 67 net/net/batman-adv/gateway_client.h | 1 net/net/batman-adv/gateway_common.c | 30 net/net/batman-adv/gateway_common.h | 6 net/net/batman-adv/hard-interface.c | 67 net/net/batman-adv/hard-interface.h | 59 net/net/batman-adv/hash.c | 20 net/net/batman-adv/hash.h | 28 net/net/batman-adv/icmp_socket.c | 19 net/net/batman-adv/icmp_socket.h | 1 net/net/batman-adv/log.c | 21 net/net/batman-adv/log.h | 62 net/net/batman-adv/main.c | 54 net/net/batman-adv/main.h | 127 + net/net/batman-adv/multicast.c | 83 net/net/batman-adv/multicast.h | 17 net/net/batman-adv/netlink.c | 27 net/net/batman-adv/netlink.h | 1 net/net/batman-adv/network-coding.c | 126 - net/net/batman-adv/network-coding.h | 1 net/net/batman-adv/originator.c | 154 + net/net/batman-adv/originator.h | 47 net/net/batman-adv/packet.h | 621 ----- net/net/batman-adv/routing.c | 56 net/net/batman-adv/routing.h | 1 net/net/batman-adv/send.c | 66 net/net/batman-adv/send.h | 8 net/net/batman-adv/soft-interface.c | 74 net/net/batman-adv/soft-interface.h | 1 net/net/batman-adv/sysfs.c | 58 net/net/batman-adv/sysfs.h | 14 net/net/batman-adv/tp_meter.c | 77 net/net/batman-adv/tp_meter.h | 1 net/net/batman-adv/translation-table.c | 234 +- net/net/batman-adv/translation-table.h | 1 net/net/batman-adv/tvlv.c | 43 net/net/batman-adv/tvlv.h | 1 net/net/batman-adv/types.h | 1996 +++++++++++++------ 63 files changed, 2863 insertions(+), 2005 deletions(-)
master: difference between net and batadv master ------------------------------------------------
netnext/include/uapi/linux/batman_adv.h | 2 +- netnext/net/batman-adv/Kconfig | 2 +- netnext/net/batman-adv/Makefile | 2 +- netnext/net/batman-adv/bat_algo.c | 2 +- netnext/net/batman-adv/bat_algo.h | 2 +- netnext/net/batman-adv/bat_iv_ogm.c | 2 +- netnext/net/batman-adv/bat_iv_ogm.h | 2 +- netnext/net/batman-adv/bat_v.c | 2 +- netnext/net/batman-adv/bat_v.h | 2 +- netnext/net/batman-adv/bat_v_elp.c | 2 +- netnext/net/batman-adv/bat_v_elp.h | 2 +- netnext/net/batman-adv/bat_v_ogm.c | 2 +- netnext/net/batman-adv/bat_v_ogm.h | 2 +- netnext/net/batman-adv/bitarray.c | 2 +- netnext/net/batman-adv/bitarray.h | 2 +- netnext/net/batman-adv/bridge_loop_avoidance.c | 2 +- netnext/net/batman-adv/bridge_loop_avoidance.h | 2 +- netnext/net/batman-adv/debugfs.c | 2 +- netnext/net/batman-adv/debugfs.h | 2 +- netnext/net/batman-adv/distributed-arp-table.c | 2 +- netnext/net/batman-adv/distributed-arp-table.h | 2 +- netnext/net/batman-adv/fragmentation.c | 5 ++--- netnext/net/batman-adv/fragmentation.h | 2 +- netnext/net/batman-adv/gateway_client.c | 2 +- netnext/net/batman-adv/gateway_client.h | 2 +- netnext/net/batman-adv/gateway_common.c | 2 +- netnext/net/batman-adv/gateway_common.h | 2 +- netnext/net/batman-adv/hard-interface.c | 2 +- netnext/net/batman-adv/hard-interface.h | 2 +- netnext/net/batman-adv/hash.c | 2 +- netnext/net/batman-adv/hash.h | 2 +- netnext/net/batman-adv/icmp_socket.c | 2 +- netnext/net/batman-adv/icmp_socket.h | 2 +- netnext/net/batman-adv/log.c | 2 +- netnext/net/batman-adv/log.h | 2 +- netnext/net/batman-adv/main.c | 2 +- netnext/net/batman-adv/main.h | 2 +- netnext/net/batman-adv/multicast.c | 2 +- netnext/net/batman-adv/multicast.h | 2 +- netnext/net/batman-adv/netlink.c | 2 +- netnext/net/batman-adv/netlink.h | 2 +- netnext/net/batman-adv/network-coding.c | 2 +- netnext/net/batman-adv/network-coding.h | 2 +- netnext/net/batman-adv/originator.c | 2 +- netnext/net/batman-adv/originator.h | 2 +- netnext/net/batman-adv/routing.c | 2 +- netnext/net/batman-adv/routing.h | 2 +- netnext/net/batman-adv/send.c | 2 +- netnext/net/batman-adv/send.h | 2 +- netnext/net/batman-adv/soft-interface.c | 10 ++++++++-- netnext/net/batman-adv/soft-interface.h | 2 +- netnext/net/batman-adv/sysfs.c | 2 +- netnext/net/batman-adv/sysfs.h | 2 +- netnext/net/batman-adv/tp_meter.c | 2 +- netnext/net/batman-adv/tp_meter.h | 2 +- netnext/net/batman-adv/translation-table.c | 2 +- netnext/net/batman-adv/translation-table.h | 2 +- netnext/net/batman-adv/tvlv.c | 2 +- netnext/net/batman-adv/tvlv.h | 2 +- netnext/net/batman-adv/types.h | 2 +- 60 files changed, 68 insertions(+), 63 deletions(-)
master: headers ---------------
diff --git a/build/net/batman-adv/soft-interface.c b/build/net/batman-adv/soft-interface.c index 33ac6c6..0631204 100644 --- a/build/net/batman-adv/soft-interface.c +++ b/build/net/batman-adv/soft-interface.c @@ -17,6 +17,7 @@ */
#include "soft-interface.h" + #include "main.h" // IWYU pragma: keep
#include <linux/atomic.h> @@ -65,6 +66,8 @@ #include "sysfs.h" #include "translation-table.h"
+struct netlink_ext_ack; + /** * batadv_skb_head_push() - Increase header size and move (push) head pointer * @skb: packet buffer which should be modified
Statistics ==========
master ------
Failed tests: 3 Started build tests: 65 Tested Linux versions: 30 Tested configs: 49
maint -----
Failed tests: 1 Started build tests: 63 Tested Linux versions: 30 Tested configs: 55
linux-merge@lists.open-mesh.org