The following commit has been merged in the merge/master branch: commit 0804b622d434046a7473827f39c77f55267f81eb Author: Sven Eckelmann sven@narfation.org Date: Sat Aug 8 02:31:49 2015 +0200

batman-adv: Add missing include spinlock.h

Fixes: fed2826b490c ("batman-adv: add list of unique single hop neighbors per hard-interface") Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 5c2df84..a8cb985 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -32,6 +32,7 @@ #include <linux/rculist.h> #include <linux/rtnetlink.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/workqueue.h> #include <net/net_namespace.h>