Commit fa452e0a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Remove redundant 'flush_workqueue()' calls, by Christophe JAILLET

 - Migrate to linux/container_of.h, by Sven Eckelmann

 - Demote batadv-on-batadv skip error message, by Sven Eckelmann

* tag 'batadv-next-pullrequest-20220302' of git://git.open-mesh.org/linux-merge:
  batman-adv: Demote batadv-on-batadv skip error message
  batman-adv: Migrate to linux/container_of.h
  batman-adv: Remove redundant 'flush_workqueue()' calls
  batman-adv: Start new development cycle
====================

Link: https://lore.kernel.org/r/20220302163522.102842-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a577223a 6ee3c393

net/batman-adv/bat_iv_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -13,13 +13,13 @@ 
#include <linux/bug.h>

#include <linux/byteorder/generic.h>

#include <linux/cache.h>

#include <linux/container_of.h>

#include <linux/errno.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/list.h>

#include <linux/lockdep.h>

net/batman-adv/bat_v_elp.c

+1 −1
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 
#include <linux/atomic.h>

#include <linux/bitops.h>

#include <linux/byteorder/generic.h>

#include <linux/container_of.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>

net/batman-adv/bat_v_ogm.c

+1 −1
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 


#include <linux/atomic.h>

#include <linux/byteorder/generic.h>

#include <linux/container_of.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/gfp.h>

#include <linux/if_ether.h>

#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/kref.h>

#include <linux/list.h>

#include <linux/lockdep.h>

net/batman-adv/bridge_loop_avoidance.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/atomic.h>

#include <linux/byteorder/generic.h>

#include <linux/compiler.h>

#include <linux/container_of.h>

#include <linux/crc16.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/atomic.h>

#include <linux/bitops.h>

#include <linux/byteorder/generic.h>

#include <linux/container_of.h>

#include <linux/errno.h>

#include <linux/etherdevice.h>

#include <linux/gfp.h>
@@ -20,7 +21,6 @@ 
#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>