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

batman at open-mesh.org batman at open-mesh.org
Wed Feb 1 00:15:52 CET 2017

The following commit has been merged in the master branch:
commit 3e7514afc7d728dd47c5fe9d7a1f5216fe659cda
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jan 28 10:23:30 2017 +0100

    batman-adv: Fix includes for IS_ERR/ERR_PTR
    IS_ERR/ERR_PTR are not defined in linux/device.h but in linux/err.h. The
    files using these macros therefore have to include the correct one.
    Reported-by: Linus Luessing <linus.luessing at web.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c
index 5406148..e32ad47 100644
--- a/net/batman-adv/debugfs.c
+++ b/net/batman-adv/debugfs.c
@@ -19,7 +19,7 @@
 #include "main.h"
 #include <linux/debugfs.h>
-#include <linux/device.h>
+#include <linux/err.h>
 #include <linux/errno.h>
 #include <linux/export.h>
 #include <linux/fs.h>
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index 07f64b6..c94ebde 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -23,7 +23,7 @@
 #include <linux/byteorder/generic.h>
 #include <linux/cache.h>
 #include <linux/compiler.h>
-#include <linux/device.h>
+#include <linux/err.h>
 #include <linux/etherdevice.h>
 #include <linux/fs.h>
 #include <linux/if_ether.h>


More information about the linux-merge mailing list