The following commit has been merged in the master branch: commit 9bcb94c8617e1c3ccabcda5ebb4f18c64a74ab6d Author: Sven Eckelmann sven@narfation.org Date: Sat Oct 29 10:13:47 2016 +0200

batman-adv: Introduce missing headers for genetlink restructure

Fixes: 56989f6d8568 ("genetlink: mark families as __ro_after_init") Fixes: 2ae0f17df1cd ("genetlink: use idr to track families") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index 005012b..2171281 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -20,11 +20,14 @@

#include <linux/atomic.h> #include <linux/byteorder/generic.h> +#include <linux/cache.h> #include <linux/errno.h> +#include <linux/export.h> #include <linux/fs.h> #include <linux/genetlink.h> #include <linux/if_ether.h> #include <linux/init.h> +#include <linux/kernel.h> #include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/printk.h>