The following commit has been merged in the master branch: commit eface060c2c354af1ad902929fc2cc9a426ad349 Author: Sven Eckelmann sven@narfation.org Date: Sun Nov 19 17:12:06 2017 +0100
batman-adv: Remove unused sched.h include
The linux/wait.h include was removed with commit 421d988b2c08 ("batman-adv: Consolidate logging related functions"). The previously required (but not unused) linux/sched.h include can also be dropped now.
Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de
diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index d94585dc2dbe..fddf16a3dc89 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -26,7 +26,6 @@ #include <linux/fs.h> #include <linux/netdevice.h> #include <linux/printk.h> -#include <linux/sched.h> /* for linux/wait.h */ #include <linux/seq_file.h> #include <linux/stat.h> #include <linux/stddef.h>
linux-merge@lists.open-mesh.org