linux-merge September 2021

linux-merge@lists.open-mesh.org

3 participants
39 discussions

Build check errors found: 2021-09-20
by postmaster＠open-mesh.org 20 Sep '21

20 Sep '21

Name of failed tests ==================== master ------ * checkpatch ./net/batman-adv/translation-table.c * difference between net-next and batadv master Output of different failed tests ================================ master: checkpatch ./net/batman-adv/translation-table.c ------------------------------------------------------- CHECK: 'synchronization' may be misspelled - perhaps 'synchronization'? #3967: FILE: ./net/batman-adv/translation-table.c:3967: + /* commit these changes immediately, to avoid synchronization problem ^^^^^^^^^^^^^^^ total: 0 errors, 0 warnings, 1 checks, 4289 lines checked master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 2 Started build tests: 270 Tested Linux versions: 41 Tested configs: 116 maint ----- Failed tests: 0 Started build tests: 323 Tested Linux versions: 41 Tested configs: 118

1 0

Build check errors found: 2021-09-19
by postmaster＠open-mesh.org 19 Sep '21

19 Sep '21

Name of failed tests ==================== master ------ * checkpatch ./net/batman-adv/translation-table.c * difference between net-next and batadv master Output of different failed tests ================================ master: checkpatch ./net/batman-adv/translation-table.c ------------------------------------------------------- CHECK: 'synchronization' may be misspelled - perhaps 'synchronization'? #3967: FILE: ./net/batman-adv/translation-table.c:3967: + /* commit these changes immediately, to avoid synchronization problem ^^^^^^^^^^^^^^^ total: 0 errors, 0 warnings, 1 checks, 4289 lines checked master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 2 Started build tests: 304 Tested Linux versions: 41 Tested configs: 114 maint ----- Failed tests: 0 Started build tests: 310 Tested Linux versions: 41 Tested configs: 123

1 0

Build check errors found: 2021-09-18
by postmaster＠open-mesh.org 18 Sep '21

18 Sep '21

Name of failed tests ==================== master ------ * checkpatch ./net/batman-adv/translation-table.c * difference between net-next and batadv master Output of different failed tests ================================ master: checkpatch ./net/batman-adv/translation-table.c ------------------------------------------------------- CHECK: 'synchronization' may be misspelled - perhaps 'synchronization'? #3967: FILE: ./net/batman-adv/translation-table.c:3967: + /* commit these changes immediately, to avoid synchronization problem ^^^^^^^^^^^^^^^ total: 0 errors, 0 warnings, 1 checks, 4289 lines checked master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 2 Started build tests: 318 Tested Linux versions: 41 Tested configs: 123 maint ----- Failed tests: 0 Started build tests: 346 Tested Linux versions: 41 Tested configs: 123

1 0

Build check errors found: 2021-09-17
by postmaster＠open-mesh.org 17 Sep '21

17 Sep '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 322 Tested Linux versions: 41 Tested configs: 120 maint ----- Failed tests: 0 Started build tests: 356 Tested Linux versions: 41 Tested configs: 123

1 0

Build check errors found: 2021-09-16
by postmaster＠open-mesh.org 16 Sep '21

16 Sep '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 287 Tested Linux versions: 41 Tested configs: 117 maint ----- Failed tests: 0 Started build tests: 353 Tested Linux versions: 41 Tested configs: 121

1 0

Build check errors found: 2021-09-15
by postmaster＠open-mesh.org 15 Sep '21

15 Sep '21

Name of failed tests ==================== master ------ * difference between net-next and batadv master * headers Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) master: headers --------------- diff --git a/net/batman-adv/bat_algo.c b/net/batman-adv/bat_algo.c index 75c1df2e..5e83b190 100644 --- a/net/batman-adv/bat_algo.c +++ b/net/batman-adv/bat_algo.c @@ -5,20 +5,18 @@ */ #include "main.h" // IWYU pragma: keep - #include <linux/errno.h> #include <linux/list.h> #include <linux/moduleparam.h> -#include <linux/netlink.h> #include <linux/printk.h> -#include <linux/skbuff.h> -#include <linux/stddef.h> #include <linux/string.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <uapi/linux/batman_adv.h> #include "bat_algo.h" +#include "linux/stddef.h" +#include "linux/types.h" +#include "net/genetlink.h" #include "netlink.h" char batadv_routing_algo[20] = "BATMAN_IV"; diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h index f9fd4ee0..4ef4e082 100644 --- a/net/batman-adv/bat_algo.h +++ b/net/batman-adv/bat_algo.h @@ -8,11 +8,12 @@ #define _NET_BATMAN_ADV_BAT_ALGO_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/netlink.h> -#include <linux/skbuff.h> #include <linux/types.h> +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "types.h" + extern char batadv_routing_algo[]; extern struct list_head batadv_hardif_list; diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 2cdc4d6b..a6df8e4b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -6,10 +6,7 @@ #include "bat_iv_ogm.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitmap.h> -#include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> @@ -24,22 +21,15 @@ #include <linux/list.h> #include <linux/lockdep.h> #include <linux/mutex.h> -#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> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <linux/workqueue.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> @@ -49,7 +39,16 @@ #include "gateway_client.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/if_ether.h" +#include "linux/netdevice.h" +#include "linux/netlink.h" +#include "linux/prandom.h" +#include "linux/rcupdate.h" +#include "linux/skbuff.h" +#include "linux/stddef.h" #include "log.h" +#include "net/genetlink.h" #include "netlink.h" #include "network-coding.h" #include "originator.h" @@ -57,6 +56,8 @@ #include "send.h" #include "translation-table.h" #include "tvlv.h" +#include "types.h" +#include "vdso/bits.h" static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work); diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index a1665f2f..538023a1 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -6,26 +6,16 @@ #include "bat_v.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/cache.h> #include <linux/errno.h> -#include <linux/if_ether.h> #include <linux/init.h> #include <linux/jiffies.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/minmax.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/types.h> #include <linux/workqueue.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> @@ -37,7 +27,16 @@ #include "gateway_common.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/netlink.h" +#include "linux/rcupdate.h" +#include "linux/skbuff.h" +#include "linux/stddef.h" #include "log.h" +#include "net/genetlink.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/bat_v.h b/net/batman-adv/bat_v.h index 918ca72c..c9e47bba 100644 --- a/net/batman-adv/bat_v.h +++ b/net/batman-adv/bat_v.h @@ -8,6 +8,7 @@ #define _NET_BATMAN_ADV_BAT_V_H_ #include "main.h" // IWYU pragma: keep +#include "types.h" #ifdef CONFIG_BATMAN_ADV_BATMAN_V diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 3b2b1194..b8d6bed0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -6,41 +6,41 @@ #include "bat_v_elp.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> -#include <linux/bitops.h> +#include <asm/processor.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> -#include <linux/ethtool.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> -#include <linux/minmax.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> #include <linux/rtnetlink.h> -#include <linux/skbuff.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <linux/workqueue.h> -#include <net/cfg80211.h> #include <uapi/linux/batadv_packet.h> #include "bat_algo.h" #include "bat_v_ogm.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/ethtool.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/prandom.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" +#include "net/cfg80211.h" #include "originator.h" #include "routing.h" #include "send.h" +#include "vdso/bits.h" /** * batadv_v_elp_start_timer() - restart timer for ELP periodic work diff --git a/net/batman-adv/bat_v_elp.h b/net/batman-adv/bat_v_elp.h index 6d629add..92a01704 100644 --- a/net/batman-adv/bat_v_elp.h +++ b/net/batman-adv/bat_v_elp.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_BAT_V_ELP_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/skbuff.h> #include <linux/workqueue.h> +#include "linux/skbuff.h" +#include "types.h" + int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface); void batadv_v_elp_iface_disable(struct batadv_hard_iface *hard_iface); void batadv_v_elp_iface_activate(struct batadv_hard_iface *primary_iface, diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 91d77595..da50966f 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -6,8 +6,7 @@ #include "bat_v_ogm.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> +#include <asm/processor.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -18,17 +17,11 @@ #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> -#include <linux/minmax.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> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <linux/workqueue.h> @@ -37,6 +30,13 @@ #include "bat_algo.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/prandom.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" #include "log.h" #include "originator.h" #include "routing.h" diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h index abb9ec67..b648d4e6 100644 --- a/net/batman-adv/bat_v_ogm.h +++ b/net/batman-adv/bat_v_ogm.h @@ -8,11 +8,12 @@ #define _NET_BATMAN_ADV_BAT_V_OGM_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/skbuff.h> #include <linux/types.h> #include <linux/workqueue.h> +#include "linux/skbuff.h" +#include "types.h" + int batadv_v_ogm_init(struct batadv_priv *bat_priv); void batadv_v_ogm_free(struct batadv_priv *bat_priv); void batadv_v_ogm_aggr_work(struct work_struct *work); diff --git a/net/batman-adv/bitarray.c b/net/batman-adv/bitarray.c index 05c20e15..4bf32162 100644 --- a/net/batman-adv/bitarray.c +++ b/net/batman-adv/bitarray.c @@ -6,9 +6,9 @@ #include "bitarray.h" #include "main.h" // IWYU pragma: keep - #include <linux/bitmap.h> +#include "linux/types.h" #include "log.h" /* shift the packet array by n places. */ diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h index afc20524..ff028fdd 100644 --- a/net/batman-adv/bitarray.h +++ b/net/batman-adv/bitarray.h @@ -8,12 +8,12 @@ #define _NET_BATMAN_ADV_BITARRAY_H_ #include "main.h" // IWYU pragma: keep - #include <linux/bitops.h> #include <linux/compiler.h> -#include <linux/stddef.h> #include <linux/types.h> +#include "linux/stddef.h" + /** * batadv_test_bit() - check if bit is set in the current window * diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index a5ada761..b546eac3 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -6,8 +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> #include <linux/crc16.h> @@ -22,19 +20,12 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> #include <net/arp.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <net/sock.h> #include <uapi/linux/batadv_packet.h> @@ -42,7 +33,16 @@ #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/if_arp.h" +#include "linux/if_ether.h" +#include "linux/lockdep_types.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/types.h" #include "log.h" +#include "net/genetlink.h" #include "netlink.h" #include "originator.h" #include "soft-interface.h" diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 3f427de5..218d2cd7 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -8,14 +8,15 @@ #define _NET_BATMAN_ADV_BLA_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> -#include <linux/skbuff.h> -#include <linux/stddef.h> #include <linux/types.h> +#include "linux/netdevice.h" +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "linux/stddef.h" +#include "types.h" + /** * batadv_bla_is_loopdetect_mac() - check if the mac address is from a loop * detect frame sent by bridge loop avoidance diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index d09309aa..db988fa3 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -6,9 +6,7 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep - #include <asm/unaligned.h> -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@ -18,23 +16,16 @@ #include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/in.h> -#include <linux/ip.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> -#include <linux/udp.h> #include <linux/workqueue.h> #include <net/arp.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <net/sock.h> #include <uapi/linux/batman_adv.h> @@ -42,13 +33,25 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/if_arp.h" +#include "linux/if_ether.h" +#include "linux/in.h" +#include "linux/ip.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" +#include "linux/udp.h" #include "log.h" +#include "net/genetlink.h" #include "netlink.h" #include "originator.h" #include "send.h" #include "soft-interface.h" #include "translation-table.h" #include "tvlv.h" +#include "uapi/linux/batadv_packet.h" enum batadv_bootpop { BATADV_BOOTREPLY = 2, diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h index 7852cf0c..b9c5c33a 100644 --- a/net/batman-adv/distributed-arp-table.h +++ b/net/batman-adv/distributed-arp-table.h @@ -8,15 +8,16 @@ #define _NET_BATMAN_ADV_DISTRIBUTED_ARP_TABLE_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> -#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/netdevice.h" +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "linux/types.h" #include "originator.h" +#include "types.h" #ifdef CONFIG_BATMAN_ADV_DAT diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index ece31cdf..889b00e0 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -6,24 +6,25 @@ #include "fragmentation.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/lockdep.h> -#include <linux/minmax.h> -#include <linux/netdevice.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/string.h> #include <uapi/linux/batadv_packet.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/list.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/types.h" #include "originator.h" #include "routing.h" #include "send.h" diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h index 5478726a..09396370 100644 --- a/net/batman-adv/fragmentation.h +++ b/net/batman-adv/fragmentation.h @@ -8,13 +8,14 @@ #define _NET_BATMAN_ADV_FRAGMENTATION_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> #include <linux/list.h> -#include <linux/skbuff.h> -#include <linux/stddef.h> #include <linux/types.h> +#include "linux/skbuff.h" +#include "linux/stddef.h" +#include "types.h" + void batadv_frag_purge_orig(struct batadv_orig_node *orig, bool (*check_cb)(struct batadv_frag_table_entry *)); bool batadv_frag_skb_fwd(struct sk_buff *skb, diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 98a9f22a..5aeeeffb 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -6,35 +6,34 @@ #include "gateway_client.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> -#include <linux/in.h> -#include <linux/ip.h> -#include <linux/ipv6.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> -#include <linux/udp.h> #include <net/sock.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/if_ether.h" +#include "linux/in.h" +#include "linux/ip.h" +#include "linux/ipv6.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "linux/types.h" +#include "linux/udp.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h index 6aff32e8..3ac9ae15 100644 --- a/net/batman-adv/gateway_client.h +++ b/net/batman-adv/gateway_client.h @@ -8,13 +8,14 @@ #define _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ #include "main.h" // IWYU pragma: keep - #include <linux/kref.h> -#include <linux/netlink.h> -#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "types.h" + void batadv_gw_check_client_stop(struct batadv_priv *bat_priv); void batadv_gw_reselect(struct batadv_priv *bat_priv); void batadv_gw_election(struct batadv_priv *bat_priv); diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 0f1764b0..8d16c65a 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -6,20 +6,19 @@ #include "gateway_common.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> -#include <linux/kstrtox.h> #include <linux/limits.h> #include <linux/math64.h> -#include <linux/netdevice.h> -#include <linux/stddef.h> #include <linux/string.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> #include "gateway_client.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/kstrtox.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" #include "tvlv.h" diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index 3a07babd..00bdfd00 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_GATEWAY_COMMON_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/netdevice.h> #include <linux/types.h> +#include "linux/netdevice.h" +#include "types.h" + /** * enum batadv_bandwidth_units - bandwidth unit types */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 7fbc51b4..82497c1e 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -6,20 +6,13 @@ #include "hard-interface.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/gfp.h> #include <linux/if.h> -#include <linux/if_arp.h> -#include <linux/if_ether.h> #include <linux/kernel.h> #include <linux/kref.h> -#include <linux/limits.h> #include <linux/list.h> -#include <linux/minmax.h> #include <linux/mutex.h> -#include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> #include <linux/rtnetlink.h> @@ -33,11 +26,18 @@ #include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" #include "gateway_client.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/if_arp.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/notifier.h" +#include "linux/types.h" #include "log.h" #include "originator.h" #include "send.h" #include "soft-interface.h" #include "translation-table.h" +#include "vdso/limits.h" /** * batadv_hardif_release() - release hard interface from lists and queue for diff --git a/net/batman-adv/hard-interface.h b/net/batman-adv/hard-interface.h index 0a30464e..f27bd5ad 100644 --- a/net/batman-adv/hard-interface.h +++ b/net/batman-adv/hard-interface.h @@ -8,15 +8,16 @@ #define _NET_BATMAN_ADV_HARD_INTERFACE_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> #include <linux/kref.h> -#include <linux/netdevice.h> #include <linux/notifier.h> -#include <linux/rcupdate.h> -#include <linux/stddef.h> #include <linux/types.h> +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "types.h" + /** * enum batadv_hard_if_state - State of a hard interface */ diff --git a/net/batman-adv/hash.c b/net/batman-adv/hash.c index 6e1e1a20..65a5e285 100644 --- a/net/batman-adv/hash.c +++ b/net/batman-adv/hash.c @@ -6,11 +6,14 @@ #include "hash.h" #include "main.h" // IWYU pragma: keep - #include <linux/gfp.h> #include <linux/lockdep.h> #include <linux/slab.h> +#include "linux/list.h" +#include "linux/spinlock.h" +#include "linux/types.h" + /* clears the hash */ static void batadv_hash_init(struct batadv_hashtable *hash) { diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index cee08a24..17532267 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -8,16 +8,17 @@ #define _NET_BATMAN_ADV_HASH_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/compiler.h> #include <linux/list.h> -#include <linux/lockdep.h> #include <linux/rculist.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/types.h> +#include "linux/atomic/atomic-instrumented.h" +#include "linux/lockdep_types.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" + /* callback to a compare function. should compare 2 element data for their * keys * diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index bbc7ce13..46fd6bd9 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -6,9 +6,8 @@ #include "log.h" #include "main.h" // IWYU pragma: keep - -#include <linux/stdarg.h> - +#include "linux/printk.h" +#include "linux/stdarg.h" #include "trace.h" /** diff --git a/net/batman-adv/log.h b/net/batman-adv/log.h index b566a6c5..ac139e95 100644 --- a/net/batman-adv/log.h +++ b/net/batman-adv/log.h @@ -8,12 +8,13 @@ #define _NET_BATMAN_ADV_LOG_H_ #include "main.h" // IWYU pragma: keep - #include <linux/atomic.h> // IWYU pragma: keep -#include <linux/bitops.h> #include <linux/compiler.h> #include <linux/printk.h> +#include "types.h" +#include "vdso/bits.h" + #ifdef CONFIG_BATMAN_ADV_DEBUG int batadv_debug_log_setup(struct batadv_priv *bat_priv); diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 1cca3e1b..0f6d1745 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -6,33 +6,23 @@ #include "main.h" // IWYU pragma: keep -#include <linux/atomic.h> -#include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/crc32c.h> #include <linux/device.h> #include <linux/errno.h> #include <linux/genetlink.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/init.h> -#include <linux/ip.h> -#include <linux/ipv6.h> #include <linux/kernel.h> #include <linux/kobject.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/minmax.h> #include <linux/module.h> -#include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> #include <net/dsfield.h> @@ -48,6 +38,17 @@ #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/build_bug.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/ip.h" +#include "linux/ipv6.h" +#include "linux/minmax.h" +#include "linux/percpu.h" +#include "linux/rcupdate.h" +#include "linux/rcutree.h" +#include "linux/stddef.h" #include "log.h" #include "multicast.h" #include "netlink.h" diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 79427c14..881e0f9a 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -209,12 +209,13 @@ enum batadv_uev_type { #include <linux/etherdevice.h> #include <linux/if_vlan.h> #include <linux/jiffies.h> -#include <linux/netdevice.h> #include <linux/percpu.h> -#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/netdevice.h" +#include "linux/skbuff.h" +#include "linux/types.h" #include "types.h" #include "main.h" // IWYU pragma: keep diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 7202ccd5..1cb9712a 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -6,8 +6,6 @@ #include "multicast.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> @@ -15,11 +13,8 @@ #include <linux/etherdevice.h> #include <linux/gfp.h> #include <linux/icmpv6.h> -#include <linux/if_bridge.h> #include <linux/if_ether.h> -#include <linux/igmp.h> #include <linux/in.h> -#include <linux/in6.h> #include <linux/inetdevice.h> #include <linux/ip.h> #include <linux/ipv6.h> @@ -28,20 +23,13 @@ #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/printk.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <linux/workqueue.h> -#include <net/addrconf.h> -#include <net/genetlink.h> #include <net/if_inet6.h> #include <net/ip.h> #include <net/ipv6.h> @@ -53,7 +41,21 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/icmpv6.h" +#include "linux/if_bridge.h" +#include "linux/if_ether.h" +#include "linux/igmp.h" +#include "linux/in6.h" +#include "linux/ip.h" +#include "linux/ipv6.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" #include "log.h" +#include "net/addrconf.h" +#include "net/genetlink.h" #include "netlink.h" #include "send.h" #include "soft-interface.h" diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 98854df3..f5cf56e6 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -8,9 +8,9 @@ #define _NET_BATMAN_ADV_MULTICAST_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/netlink.h> -#include <linux/skbuff.h> +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "types.h" /** * enum batadv_forw_mode - the way a packet should be forwarded as diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 91c0a227..7ec97dc4 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -6,32 +6,20 @@ #include "netlink.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> -#include <linux/cache.h> #include <linux/err.h> #include <linux/errno.h> #include <linux/export.h> -#include <linux/genetlink.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/if_vlan.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/limits.h> #include <linux/list.h> -#include <linux/minmax.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/printk.h> #include <linux/rtnetlink.h> -#include <linux/skbuff.h> -#include <linux/stddef.h> #include <linux/types.h> -#include <net/genetlink.h> #include <net/net_namespace.h> #include <net/netlink.h> #include <net/sock.h> @@ -44,6 +32,14 @@ #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/cache.h" +#include "linux/genetlink.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/skbuff.h" +#include "linux/stddef.h" #include "log.h" #include "multicast.h" #include "network-coding.h" @@ -51,6 +47,8 @@ #include "soft-interface.h" #include "tp_meter.h" #include "translation-table.h" +#include "vdso/bits.h" +#include "vdso/limits.h" struct genl_family batadv_netlink_family; diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 6f2e6ff0..307184d2 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_NETLINK_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/netlink.h> #include <linux/types.h> -#include <net/genetlink.h> + +#include "linux/netlink.h" +#include "net/genetlink.h" +#include "types.h" void batadv_netlink_register(void); void batadv_netlink_unregister(void); diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 0258c79c..6d526ef1 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -6,11 +6,8 @@ #include "network-coding.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> -#include <linux/compiler.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> @@ -24,20 +21,25 @@ #include <linux/list.h> #include <linux/lockdep.h> #include <linux/net.h> -#include <linux/netdevice.h> -#include <linux/prandom.h> #include <linux/printk.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> #include <uapi/linux/batadv_packet.h> #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/kern_levels.h" +#include "linux/lockdep_types.h" +#include "linux/prandom.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" #include "originator.h" #include "routing.h" diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index e24670c5..61bc2666 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -8,12 +8,13 @@ #define _NET_BATMAN_ADV_NETWORK_CODING_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/netdevice.h> -#include <linux/skbuff.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/netdevice.h" +#include "linux/skbuff.h" +#include "types.h" + #ifdef CONFIG_BATMAN_ADV_NC void batadv_nc_status_update(struct net_device *net_dev); diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 51e12ae9..eed1aed0 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -6,8 +6,6 @@ #include "originator.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> @@ -15,15 +13,9 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/lockdep.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/workqueue.h> #include <net/sock.h> #include <uapi/linux/batadv_packet.h> @@ -35,6 +27,13 @@ #include "gateway_client.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/lockdep_types.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" #include "multicast.h" #include "netlink.h" diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index e6f3278b..11c383bb 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -8,15 +8,16 @@ #define _NET_BATMAN_ADV_ORIGINATOR_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> -#include <linux/if_ether.h> #include <linux/jhash.h> #include <linux/kref.h> -#include <linux/netlink.h> -#include <linux/skbuff.h> #include <linux/types.h> +#include "linux/if_ether.h" +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "types.h" + bool batadv_compare_orig(const struct hlist_node *node, const void *data2); int batadv_originator_init(struct batadv_priv *bat_priv); void batadv_originator_free(struct batadv_priv *bat_priv); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index c2ef6716..9ae39b04 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -6,22 +6,15 @@ #include "routing.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> -#include <linux/compiler.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/if_ether.h> #include <linux/jiffies.h> #include <linux/kref.h> -#include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <uapi/linux/batadv_packet.h> #include "bitarray.h" @@ -29,6 +22,14 @@ #include "distributed-arp-table.h" #include "fragmentation.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/dynamic_debug.h" +#include "linux/if_ether.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" #include "network-coding.h" #include "originator.h" diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 4f1769b4..dc0c7634 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_ROUTING_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/skbuff.h> #include <linux/types.h> +#include "linux/skbuff.h" +#include "types.h" + bool batadv_check_management_packet(struct sk_buff *skb, struct batadv_hard_iface *hard_iface, int header_len); diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index c0500d48..f825c71b 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -6,8 +6,6 @@ #include "send.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@ -19,26 +17,30 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> -#include <linux/netdevice.h> #include <linux/printk.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/workqueue.h> #include "distributed-arp-table.h" #include "fragmentation.h" #include "gateway_client.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" #include "network-coding.h" #include "originator.h" #include "routing.h" #include "soft-interface.h" #include "translation-table.h" +#include "uapi/linux/batadv_packet.h" static void batadv_send_outstanding_bcast_packet(struct work_struct *work); diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index e093910f..503630ca 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -8,13 +8,14 @@ #define _NET_BATMAN_ADV_SEND_H_ #include "main.h" // IWYU pragma: keep - #include <linux/compiler.h> -#include <linux/skbuff.h> -#include <linux/spinlock.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/skbuff.h" +#include "linux/spinlock_types.h" +#include "types.h" + void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet, bool dropped); struct batadv_forw_packet * diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 305ca1da..7b0883f2 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -6,15 +6,12 @@ #include "soft-interface.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> #include <linux/compiler.h> #include <linux/cpumask.h> #include <linux/errno.h> #include <linux/etherdevice.h> -#include <linux/ethtool.h> #include <linux/gfp.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> @@ -23,17 +20,12 @@ #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/percpu.h> #include <linux/random.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/socket.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <net/net_namespace.h> @@ -46,7 +38,19 @@ #include "distributed-arp-table.h" #include "gateway_client.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/compiler.h" +#include "linux/ethtool.h" +#include "linux/if_ether.h" +#include "linux/lockdep_types.h" +#include "linux/netdev_features.h" +#include "linux/netlink.h" +#include "linux/rcupdate.h" +#include "linux/rcutree.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "multicast.h" +#include "net/rtnetlink.h" #include "network-coding.h" #include "originator.h" #include "send.h" diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 84e6f133..449ed6bb 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -8,13 +8,14 @@ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #include "main.h" // IWYU pragma: keep - #include <linux/kref.h> -#include <linux/netdevice.h> -#include <linux/skbuff.h> #include <linux/types.h> #include <net/rtnetlink.h> +#include "linux/netdevice.h" +#include "linux/skbuff.h" +#include "types.h" + int batadv_skb_head_push(struct sk_buff *skb, unsigned int len); void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, int hdr_size, diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index ac52e1fa..b3b5f27f 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -6,47 +6,46 @@ #include "tp_meter.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> -#include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> -#include <linux/compiler.h> #include <linux/err.h> #include <linux/etherdevice.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/init.h> #include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/kthread.h> -#include <linux/limits.h> #include <linux/list.h> -#include <linux/minmax.h> -#include <linux/netdevice.h> #include <linux/param.h> #include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> #include <linux/sched.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> -#include <linux/timer.h> #include <linux/wait.h> #include <linux/workqueue.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/build_bug.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/minmax.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/stddef.h" +#include "linux/timer.h" +#include "linux/types.h" #include "log.h" #include "netlink.h" #include "originator.h" #include "send.h" +#include "vdso/limits.h" /** * BATADV_TP_DEF_TEST_LENGTH - Default test length if not specified by the user diff --git a/net/batman-adv/tp_meter.h b/net/batman-adv/tp_meter.h index 1563d329..a6da0af8 100644 --- a/net/batman-adv/tp_meter.h +++ b/net/batman-adv/tp_meter.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_TP_METER_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/skbuff.h> #include <linux/types.h> +#include "linux/skbuff.h" +#include "types.h" + void batadv_tp_meter_init(void); void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, u32 test_length, u32 *cookie); diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f16ab6a4..e930f48d 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -6,10 +6,7 @@ #include "translation-table.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> -#include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> #include <linux/compiler.h> @@ -17,7 +14,6 @@ #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/init.h> #include <linux/jhash.h> #include <linux/jiffies.h> @@ -26,17 +22,11 @@ #include <linux/list.h> #include <linux/lockdep.h> #include <linux/net.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/workqueue.h> -#include <net/genetlink.h> #include <net/netlink.h> #include <net/sock.h> #include <uapi/linux/batadv_packet.h> @@ -45,7 +35,17 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" +#include "linux/build_bug.h" +#include "linux/compiler.h" +#include "linux/if_ether.h" +#include "linux/lockdep_types.h" +#include "linux/rcupdate.h" +#include "linux/spinlock_types.h" +#include "linux/stddef.h" +#include "linux/types.h" #include "log.h" +#include "net/genetlink.h" #include "netlink.h" #include "originator.h" #include "soft-interface.h" diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 83ae16ab..fb6a6524 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -8,13 +8,14 @@ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ #include "main.h" // IWYU pragma: keep - #include <linux/kref.h> -#include <linux/netdevice.h> -#include <linux/netlink.h> -#include <linux/skbuff.h> #include <linux/types.h> +#include "linux/netdevice.h" +#include "linux/netlink.h" +#include "linux/skbuff.h" +#include "types.h" + int batadv_tt_init(struct batadv_priv *bat_priv); bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, unsigned short vid, int ifindex, u32 mark); diff --git a/net/batman-adv/tvlv.c b/net/batman-adv/tvlv.c index dbb51c6c..ad2e0a75 100644 --- a/net/batman-adv/tvlv.c +++ b/net/batman-adv/tvlv.c @@ -5,27 +5,26 @@ */ #include "main.h" // IWYU pragma: keep - #include <linux/byteorder/generic.h> #include <linux/etherdevice.h> #include <linux/gfp.h> -#include <linux/if_ether.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> -#include <linux/netdevice.h> #include <linux/pkt_sched.h> #include <linux/rculist.h> -#include <linux/rcupdate.h> -#include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> -#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "linux/if_ether.h" +#include "linux/netdevice.h" +#include "linux/rcupdate.h" +#include "linux/skbuff.h" +#include "linux/stddef.h" #include "originator.h" #include "send.h" #include "tvlv.h" diff --git a/net/batman-adv/tvlv.h b/net/batman-adv/tvlv.h index b7e47695..c79d667b 100644 --- a/net/batman-adv/tvlv.h +++ b/net/batman-adv/tvlv.h @@ -8,10 +8,11 @@ #define _NET_BATMAN_ADV_TVLV_H_ #include "main.h" // IWYU pragma: keep - #include <linux/types.h> #include <uapi/linux/batadv_packet.h> +#include "types.h" + void batadv_tvlv_container_register(struct batadv_priv *bat_priv, u8 type, u8 version, void *tvlv_value, u16 tvlv_value_len); Statistics ========== maint ----- Failed tests: 0 Started build tests: 307 Tested Linux versions: 41 Tested configs: 115 master ------ Failed tests: 2 Started build tests: 283 Tested Linux versions: 41 Tested configs: 117

1 0

Build check errors found: 2021-09-14
by postmaster＠open-mesh.org 14 Sep '21

14 Sep '21

Name of failed tests ==================== master ------ * headers maint ----- * difference between net and batadv maint * sparse linux-5.15-rc1 cfg: BLA=n DAT=n DEBUG=y TRACING=y NC=n MCAST=y BATMAN_V=y * sparse linux-5.15-rc1 cfg: BLA=n DAT=y DEBUG=y TRACING=n NC=y MCAST=n BATMAN_V=n * sparse linux-5.15-rc1 cfg: BLA=y DAT=n DEBUG=y TRACING=y NC=y MCAST=y BATMAN_V=n Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/Documentation/networking/batman-adv.rst | 2 net/MAINTAINERS | 2 net/net/batman-adv/bat_iv_ogm.c | 75 ++++-------- net/net/batman-adv/bat_v.c | 30 +---- net/net/batman-adv/bat_v_elp.c | 9 - net/net/batman-adv/bat_v_ogm.c | 39 ++---- net/net/batman-adv/bridge_loop_avoidance.c | 39 ++---- net/net/batman-adv/distributed-arp-table.c | 27 +--- net/net/batman-adv/fragmentation.c | 6 - net/net/batman-adv/gateway_client.c | 60 ++-------- net/net/batman-adv/gateway_client.h | 16 ++ net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/hard-interface.c | 21 +-- net/net/batman-adv/hard-interface.h | 3 net/net/batman-adv/log.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 11 - net/net/batman-adv/netlink.c | 6 - net/net/batman-adv/network-coding.c | 24 ++-- net/net/batman-adv/originator.c | 114 +++---------------- net/net/batman-adv/originator.h | 96 ++++++++++++++-- net/net/batman-adv/routing.c | 39 ++---- net/net/batman-adv/send.c | 33 ++--- net/net/batman-adv/soft-interface.c | 27 ---- net/net/batman-adv/soft-interface.h | 16 ++ net/net/batman-adv/tp_meter.c | 27 +--- net/net/batman-adv/translation-table.c | 109 ++++++------------ net/net/batman-adv/translation-table.h | 18 ++- net/net/batman-adv/tvlv.c | 9 + 29 files changed, 379 insertions(+), 485 deletions(-) master: headers --------------- diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 2cdc4d6b..cb6e2271 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -6,8 +6,6 @@ #include "bat_iv_ogm.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h> @@ -49,6 +47,7 @@ #include "gateway_client.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "network-coding.h" diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index a1665f2f..52b4c624 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -6,8 +6,6 @@ #include "bat_v.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/cache.h> #include <linux/errno.h> #include <linux/if_ether.h> @@ -37,6 +35,7 @@ #include "gateway_common.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 3b2b1194..fccb4d12 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -6,8 +6,6 @@ #include "bat_v_elp.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@ -37,6 +35,7 @@ #include "bat_algo.h" #include "bat_v_ogm.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "originator.h" #include "routing.h" diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 91d77595..49dab266 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -6,8 +6,6 @@ #include "bat_v_ogm.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -37,6 +35,7 @@ #include "bat_algo.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "originator.h" #include "routing.h" diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index a5ada761..b07b164a 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -6,8 +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> #include <linux/crc16.h> @@ -42,6 +40,7 @@ #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index d09309aa..c04b3ca6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -6,9 +6,7 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep - #include <asm/unaligned.h> -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@ -42,6 +40,7 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index ece31cdf..4a46c189 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -6,8 +6,6 @@ #include "fragmentation.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -24,6 +22,7 @@ #include <uapi/linux/batadv_packet.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "originator.h" #include "routing.h" #include "send.h" diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 98a9f22a..9c278da3 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -6,8 +6,6 @@ #include "gateway_client.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -35,6 +33,7 @@ #include <uapi/linux/batman_adv.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 0f1764b0..1de04cbf 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -6,8 +6,6 @@ #include "gateway_common.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/kstrtox.h> @@ -20,6 +18,7 @@ #include <uapi/linux/batman_adv.h> #include "gateway_client.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "tvlv.h" diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 7fbc51b4..91cb3275 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -6,8 +6,6 @@ #include "hard-interface.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/gfp.h> #include <linux/if.h> @@ -33,6 +31,7 @@ #include "bridge_loop_avoidance.h" #include "distributed-arp-table.h" #include "gateway_client.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "originator.h" #include "send.h" diff --git a/net/batman-adv/hash.h b/net/batman-adv/hash.h index cee08a24..4b773f0f 100644 --- a/net/batman-adv/hash.h +++ b/net/batman-adv/hash.h @@ -8,8 +8,6 @@ #define _NET_BATMAN_ADV_HASH_H_ #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/compiler.h> #include <linux/list.h> #include <linux/lockdep.h> @@ -18,6 +16,8 @@ #include <linux/stddef.h> #include <linux/types.h> +#include "linux/atomic/atomic-instrumented.h" + /* callback to a compare function. should compare 2 element data for their * keys * diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 1cca3e1b..991b3b2d 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -6,7 +6,6 @@ #include "main.h" // IWYU pragma: keep -#include <linux/atomic.h> #include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/crc32c.h> @@ -48,6 +47,7 @@ #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "multicast.h" #include "netlink.h" diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 7202ccd5..7ab80679 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -6,8 +6,6 @@ #include "multicast.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> @@ -53,6 +51,7 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "send.h" diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 91c0a227..ce674978 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -6,8 +6,6 @@ #include "netlink.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> @@ -44,6 +42,7 @@ #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "multicast.h" #include "network-coding.h" diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 0258c79c..b6c69384 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -6,8 +6,6 @@ #include "network-coding.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> @@ -38,6 +36,7 @@ #include <uapi/linux/batadv_packet.h> #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "originator.h" #include "routing.h" diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 51e12ae9..928f5bea 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -6,8 +6,6 @@ #include "originator.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/gfp.h> @@ -35,6 +33,7 @@ #include "gateway_client.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "multicast.h" #include "netlink.h" diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index c2ef6716..a9dbefe4 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -6,8 +6,6 @@ #include "routing.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/errno.h> @@ -29,6 +27,7 @@ #include "distributed-arp-table.h" #include "fragmentation.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "network-coding.h" #include "originator.h" diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index c0500d48..04c0ff55 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -6,8 +6,6 @@ #include "send.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> @@ -33,6 +31,7 @@ #include "fragmentation.h" #include "gateway_client.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "network-coding.h" #include "originator.h" diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 305ca1da..95256e1b 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -6,8 +6,6 @@ #include "soft-interface.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> #include <linux/compiler.h> @@ -46,6 +44,7 @@ #include "distributed-arp-table.h" #include "gateway_client.h" #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "multicast.h" #include "network-coding.h" #include "originator.h" diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index ac52e1fa..9c50a020 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -6,8 +6,6 @@ #include "tp_meter.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/build_bug.h> #include <linux/byteorder/generic.h> #include <linux/cache.h> @@ -43,6 +41,7 @@ #include <uapi/linux/batman_adv.h> #include "hard-interface.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f16ab6a4..14e0e7b9 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -6,8 +6,6 @@ #include "translation-table.h" #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bitops.h> #include <linux/build_bug.h> #include <linux/byteorder/generic.h> @@ -45,6 +43,7 @@ #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" +#include "linux/atomic/atomic-instrumented.h" #include "log.h" #include "netlink.h" #include "originator.h" maint: sparse linux-5.15-rc1 cfg: BLA=n DAT=y DEBUG=y TRACING=n NC=y MCAST=n BATMAN_V=n --------------------------------------------------------------------------- /home/build_test/build_env/tmp.HAiqHygXVC/net/batman-adv/log.c: note: in included file: /usr/lib/gcc/x86_64-linux-gnu/8/include/stdarg.h:49:9: warning: preprocessor token va_arg redefined /home/build_test/build_env/tmp.HAiqHygXVC/net/batman-adv/log.c: note: in included file (through include/linux/kernel.h, include/linux/skbuff.h, /home/build_test/build_env/tmp.HAiqHygXVC/compat-include//linux/skbuff.h, include/linux/if_ether.h, ...): ./include/linux/stdarg.h:8:9: this was the original definition Statistics ========== master ------ Failed tests: 1 Started build tests: 289 Tested Linux versions: 41 Tested configs: 116 maint ----- Failed tests: 4 Started build tests: 358 Tested Linux versions: 41 Tested configs: 118

1 0

Build check errors found: 2021-09-13
by postmaster＠open-mesh.org 13 Sep '21

13 Sep '21

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * headers Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/Documentation/networking/batman-adv.rst | 2 net/MAINTAINERS | 2 net/net/batman-adv/bat_iv_ogm.c | 75 ++++-------- net/net/batman-adv/bat_v.c | 30 +---- net/net/batman-adv/bat_v_elp.c | 9 - net/net/batman-adv/bat_v_ogm.c | 39 ++---- net/net/batman-adv/bridge_loop_avoidance.c | 39 ++---- net/net/batman-adv/distributed-arp-table.c | 27 +--- net/net/batman-adv/fragmentation.c | 6 - net/net/batman-adv/gateway_client.c | 60 ++-------- net/net/batman-adv/gateway_client.h | 16 ++ net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/hard-interface.c | 21 +-- net/net/batman-adv/hard-interface.h | 3 net/net/batman-adv/log.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 11 - net/net/batman-adv/netlink.c | 6 - net/net/batman-adv/network-coding.c | 24 ++-- net/net/batman-adv/originator.c | 114 +++---------------- net/net/batman-adv/originator.h | 96 ++++++++++++++-- net/net/batman-adv/routing.c | 39 ++---- net/net/batman-adv/send.c | 33 ++--- net/net/batman-adv/soft-interface.c | 27 ---- net/net/batman-adv/soft-interface.h | 16 ++ net/net/batman-adv/tp_meter.c | 27 +--- net/net/batman-adv/translation-table.c | 109 ++++++------------ net/net/batman-adv/translation-table.h | 18 ++- net/net/batman-adv/tvlv.c | 9 + 29 files changed, 379 insertions(+), 485 deletions(-) master: headers --------------- diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index bbc7ce13..931692a3 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -5,9 +5,9 @@ */ #include "log.h" -#include "main.h" // IWYU pragma: keep -#include <linux/stdarg.h> +#include <stdarg.h> +#include "main.h" // IWYU pragma: keep #include "trace.h" Statistics ========== maint ----- Failed tests: 1 Started build tests: 347 Tested Linux versions: 39 Tested configs: 123 master ------ Failed tests: 1 Started build tests: 287 Tested Linux versions: 39 Tested configs: 116

1 0

Build check errors found: 2021-09-12
by postmaster＠open-mesh.org 12 Sep '21

12 Sep '21

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * headers Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/Documentation/networking/batman-adv.rst | 2 net/MAINTAINERS | 2 net/net/batman-adv/bat_iv_ogm.c | 75 ++++-------- net/net/batman-adv/bat_v.c | 30 +---- net/net/batman-adv/bat_v_elp.c | 9 - net/net/batman-adv/bat_v_ogm.c | 39 ++---- net/net/batman-adv/bridge_loop_avoidance.c | 39 ++---- net/net/batman-adv/distributed-arp-table.c | 27 +--- net/net/batman-adv/fragmentation.c | 6 - net/net/batman-adv/gateway_client.c | 60 ++-------- net/net/batman-adv/gateway_client.h | 16 ++ net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/hard-interface.c | 21 +-- net/net/batman-adv/hard-interface.h | 3 net/net/batman-adv/log.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 11 - net/net/batman-adv/netlink.c | 6 - net/net/batman-adv/network-coding.c | 24 ++-- net/net/batman-adv/originator.c | 114 +++---------------- net/net/batman-adv/originator.h | 96 ++++++++++++++-- net/net/batman-adv/routing.c | 39 ++---- net/net/batman-adv/send.c | 33 ++--- net/net/batman-adv/soft-interface.c | 27 ---- net/net/batman-adv/soft-interface.h | 16 ++ net/net/batman-adv/tp_meter.c | 27 +--- net/net/batman-adv/translation-table.c | 109 ++++++------------ net/net/batman-adv/translation-table.h | 18 ++- net/net/batman-adv/tvlv.c | 9 + 29 files changed, 379 insertions(+), 485 deletions(-) master: headers --------------- diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index bbc7ce13..931692a3 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -5,9 +5,9 @@ */ #include "log.h" -#include "main.h" // IWYU pragma: keep -#include <linux/stdarg.h> +#include <stdarg.h> +#include "main.h" // IWYU pragma: keep #include "trace.h" Statistics ========== maint ----- Failed tests: 1 Started build tests: 344 Tested Linux versions: 39 Tested configs: 118 master ------ Failed tests: 1 Started build tests: 291 Tested Linux versions: 39 Tested configs: 117

1 0

Build check errors found: 2021-09-11
by postmaster＠open-mesh.org 11 Sep '21

11 Sep '21

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * headers Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/Documentation/networking/batman-adv.rst | 2 net/MAINTAINERS | 2 net/net/batman-adv/bat_iv_ogm.c | 75 ++++-------- net/net/batman-adv/bat_v.c | 30 +---- net/net/batman-adv/bat_v_elp.c | 9 - net/net/batman-adv/bat_v_ogm.c | 39 ++---- net/net/batman-adv/bridge_loop_avoidance.c | 39 ++---- net/net/batman-adv/distributed-arp-table.c | 27 +--- net/net/batman-adv/fragmentation.c | 6 - net/net/batman-adv/gateway_client.c | 60 ++-------- net/net/batman-adv/gateway_client.h | 16 ++ net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/hard-interface.c | 21 +-- net/net/batman-adv/hard-interface.h | 3 net/net/batman-adv/log.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 11 - net/net/batman-adv/netlink.c | 6 - net/net/batman-adv/network-coding.c | 24 ++-- net/net/batman-adv/originator.c | 114 +++---------------- net/net/batman-adv/originator.h | 96 ++++++++++++++-- net/net/batman-adv/routing.c | 39 ++---- net/net/batman-adv/send.c | 33 ++--- net/net/batman-adv/soft-interface.c | 27 ---- net/net/batman-adv/soft-interface.h | 16 ++ net/net/batman-adv/tp_meter.c | 27 +--- net/net/batman-adv/translation-table.c | 109 ++++++------------ net/net/batman-adv/translation-table.h | 18 ++- net/net/batman-adv/tvlv.c | 9 + 29 files changed, 379 insertions(+), 485 deletions(-) master: headers --------------- diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c index bbc7ce13..931692a3 100644 --- a/net/batman-adv/log.c +++ b/net/batman-adv/log.c @@ -5,9 +5,9 @@ */ #include "log.h" -#include "main.h" // IWYU pragma: keep -#include <linux/stdarg.h> +#include <stdarg.h> +#include "main.h" // IWYU pragma: keep #include "trace.h" Statistics ========== maint ----- Failed tests: 1 Started build tests: 354 Tested Linux versions: 39 Tested configs: 124 master ------ Failed tests: 1 Started build tests: 314 Tested Linux versions: 39 Tested configs: 117

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge September 2021