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

batman at open-mesh.org batman at open-mesh.org
Sat Dec 23 00:17:44 CET 2017

The following commit has been merged in the master branch:
commit 4e58452b6fc391c35611693b12a3f97bd60f6da8
Author: Sven Eckelmann <sven.eckelmann at openmesh.com>
Date:   Thu Dec 21 10:17:38 2017 +0100

    batman-adv: Let packet.h include its headers directly
    The headers used by packet.h should also be included by it directly. main.h
    is currently dealing with it in batman-adv, but this will no longer work
    when this header is moved to include/uapi/linux/.
    Signed-off-by: Sven Eckelmann <sven.eckelmann at openmesh.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 5ac86df48c42..d5484ac381d3 100644
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -217,10 +217,8 @@ enum batadv_uev_type {
 /* Kernel headers */
-#include <linux/bitops.h> /* for packet.h */
 #include <linux/compiler.h>
 #include <linux/etherdevice.h>
-#include <linux/if_ether.h> /* for packet.h */
 #include <linux/if_vlan.h>
 #include <linux/jiffies.h>
 #include <linux/percpu.h>
diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index dccbd4a6f019..6b6563867455 100644
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -20,6 +20,8 @@
 #include <asm/byteorder.h>
+#include <linux/bitops.h>
+#include <linux/if_ether.h>
 #include <linux/types.h>


More information about the linux-merge mailing list