Name of failed tests ====================
* difference between net-next and batadv next * headers master
Output of different failed tests ================================
difference between net-next and batadv next -------------------------------------------
Documentation/ABI/testing/sysfs-class-net-batman-adv | 17 net/batman-adv/Kconfig | 14 net/batman-adv/Makefile | 3 net/batman-adv/bat_algo.h | 28 net/batman-adv/bat_iv_ogm.c | 11 net/batman-adv/bat_v.c | 347 ---- net/batman-adv/bat_v_elp.c | 515 ------ net/batman-adv/bat_v_elp.h | 33 net/batman-adv/bat_v_ogm.c | 833 ---------- net/batman-adv/bat_v_ogm.h | 36 net/batman-adv/distributed-arp-table.c | 4 net/batman-adv/fragmentation.c | 8 net/batman-adv/gateway_common.c | 4 net/batman-adv/gateway_common.h | 2 net/batman-adv/icmp_socket.c | 2 net/batman-adv/main.c | 7 net/batman-adv/main.h | 12 net/batman-adv/network-coding.c | 22 net/batman-adv/packet.h | 49 net/batman-adv/send.c | 55 net/batman-adv/send.h | 10 net/batman-adv/sysfs.c | 130 - net/batman-adv/types.h | 93 - 23 files changed, 42 insertions(+), 2193 deletions(-)
headers master --------------
diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index f93cbc7..9b191bd 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -21,6 +21,7 @@ #include "main.h"
#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 417d30a..adc1c65 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" - +#include <linux/types.h> #include <net/rtnetlink.h> +#include "main.h"
struct net_device; struct sk_buff;
linux-merge@lists.open-mesh.org