[linux-next] LinuxNextTracking branch, master, updated. next-20171221

batman at open-mesh.org batman at open-mesh.org
Fri Dec 22 00:16:31 CET 2017

The following commit has been merged in the master branch:
commit 8cfba951a0e65acb4ea9fe669a0aa09a44c5d1de
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Nov 19 17:12:05 2017 +0100

    batman-adv: include kobject.h for kobject_* functions
    The linux/kobject.h provides the kobject_* function declarations and should
    therefore be included directly before they are used.
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index 374ff46feb8e..227a072dc1d3 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -27,6 +27,7 @@
 #include <linux/if.h>
 #include <linux/if_vlan.h>
 #include <linux/kernel.h>
+#include <linux/kobject.h>
 #include <linux/kref.h>
 #include <linux/netdevice.h>
 #include <linux/printk.h>


More information about the linux-merge mailing list