Name of failed tests ====================
* difference between net-next and batadv next * headers master * main.h include missing master
Output of different failed tests ================================
difference between net-next and batadv next -------------------------------------------
netnext/net/batman-adv/bat_iv_ogm.c | 9 +- netnext/net/batman-adv/bat_v.c | 66 ++------------------ netnext/net/batman-adv/bat_v_elp.c | 31 ++------- netnext/net/batman-adv/bat_v_elp.h | 2 netnext/net/batman-adv/originator.c | 6 - netnext/net/batman-adv/routing.c | 4 - netnext/net/batman-adv/translation-table.c | 6 - 7 files changed, 27 insertions(+), 97 deletions(-)
headers master --------------
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 9d8c07e..8dd1eb7 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -31,8 +31,8 @@ #include <linux/init.h> #include <linux/jiffies.h> #include <linux/kernel.h> -#include <linux/list.h> #include <linux/kref.h> +#include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/pkt_sched.h> diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 29d2660..a0d24f5 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -19,8 +19,8 @@ #include "main.h" // IWYU pragma: keep
#include <linux/atomic.h> -#include <linux/errno.h> #include <linux/byteorder/generic.h> +#include <linux/errno.h> #include <linux/kernel.h> #include <linux/math64.h> #include <linux/netdevice.h> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 202e63a..3adfb3a 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -23,9 +23,9 @@ #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/fs.h> +#include <linux/if.h> #include <linux/if_arp.h> #include <linux/if_ether.h> -#include <linux/if.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 8e61a3d..af806f4 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -181,12 +181,12 @@ enum batadv_uev_type { #include <linux/cpumask.h> #include <linux/etherdevice.h> #include <linux/if_ether.h> /* for packet.h */ // IWYU pragma: keep +#include <linux/if_vlan.h> +#include <linux/jiffies.h> #include <linux/netdevice.h> +#include <linux/percpu.h> #include <linux/printk.h> #include <linux/types.h> -#include <linux/percpu.h> -#include <linux/jiffies.h> -#include <linux/if_vlan.h>
#include "types.h"
diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 1a656c4..e0af73f 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -29,8 +29,8 @@ #include <linux/if_bridge.h> #include <linux/if_ether.h> #include <linux/igmp.h> -#include <linux/in6.h> #include <linux/in.h> +#include <linux/in6.h> #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/kernel.h> diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 8404163..e7a34ed 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -16,8 +16,6 @@ */
#include "main.h" // IWYU pragma: keep -#include "netlink.h" - #include <linux/errno.h> #include <linux/fs.h> #include <linux/genetlink.h> @@ -25,13 +23,14 @@ #include <linux/init.h> #include <linux/netdevice.h> #include <linux/netlink.h> -#include <linux/stddef.h> #include <linux/printk.h> +#include <linux/stddef.h> #include <net/genetlink.h> #include <net/netlink.h> #include <uapi/linux/batman_adv.h>
#include "hard-interface.h" +#include "netlink.h" #include "soft-interface.h"
struct sk_buff; diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 0b2a911..4902fd0 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -22,8 +22,8 @@ #include <linux/byteorder/generic.h> #include <linux/etherdevice.h> #include <linux/fs.h> -#include <linux/if_ether.h> #include <linux/if.h> +#include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 2d47257..025d2dc 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -25,8 +25,8 @@ #include <linux/fs.h> #include <linux/if.h> #include <linux/if_vlan.h> -#include <linux/kref.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> @@ -38,10 +38,10 @@ #include <linux/string.h> #include <linux/stringify.h>
+#include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" #include "gateway_client.h" #include "gateway_common.h" -#include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "network-coding.h" #include "packet.h"
main.h include missing master -----------------------------
missing include for "main.h" in net/batman-adv/bat_algo.h missing include for "main.h" in net/batman-adv/bat_v_ogm.h missing include for "main.h" in net/batman-adv/netlink.h
linux-merge@lists.open-mesh.org