The following commit has been merged in the merge/master branch: commit ba17db26e2d5226c1749195006e258d09b291c45 Author: Sven Eckelmann sven.eckelmann@open-mesh.com Date: Thu May 5 12:35:19 2016 +0200

batman-adv: Add missing include for container_of

Fixes: 0d8468553c3c ("batman-adv: remove ogm_emit and ogm_schedule API calls") Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 67bdba1..4815db9 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -30,6 +30,7 @@ #include <linux/if_ether.h> #include <linux/init.h> #include <linux/jiffies.h> +#include <linux/kernel.h> #include <linux/list.h> #include <linux/kref.h> #include <linux/lockdep.h>