[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 ecc36f5ee6fdc73237b0fe693ca752d4b16e65bc
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Nov 19 17:12:03 2017 +0100

    batman-adv: include build_bug.h for BUILD_BUG_ON define
    
    commit bc6245e5efd7 ("bug: split BUILD_BUG stuff out into
    <linux/build_bug.h>") added a new header for BUILD_BUG_ON. It should
    therefore be included instead of linux/bug.h
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 0c3664aa6a58..6f6c500e8aa8 100644
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -19,7 +19,7 @@
 #include "main.h"
 
 #include <linux/atomic.h>
-#include <linux/bug.h>
+#include <linux/build_bug.h>
 #include <linux/byteorder/generic.h>
 #include <linux/crc32c.h>
 #include <linux/errno.h>
diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c
index e33f64f0fcb8..fe9eb2970ec9 100644
--- a/net/batman-adv/tp_meter.c
+++ b/net/batman-adv/tp_meter.c
@@ -20,7 +20,7 @@
 #include "main.h"
 
 #include <linux/atomic.h>
-#include <linux/bug.h>
+#include <linux/build_bug.h>
 #include <linux/byteorder/generic.h>
 #include <linux/cache.h>
 #include <linux/compiler.h>
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index db40ca6243b3..27a0c34a5ad0 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -21,7 +21,7 @@
 
 #include <linux/atomic.h>
 #include <linux/bitops.h>
-#include <linux/bug.h>
+#include <linux/build_bug.h>
 #include <linux/byteorder/generic.h>
 #include <linux/cache.h>
 #include <linux/compiler.h>

-- 
LinuxNextTracking


More information about the linux-merge mailing list