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 -------------------------------------------
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 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