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

batman at open-mesh.org batman at open-mesh.org
Wed May 30 00:17:34 CEST 2018

The following commit has been merged in the master branch:
commit 18cfb44cf1845d11d50f4733e039acb8b377c8eb
Author: Marek Lindner <mareklindner at neomailbox.ch>
Date:   Mon May 14 06:42:59 2018 +0800

    batman-adv: enable B.A.T.M.A.N. V compilation by default
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Acked-by: Antonio Quartulli <a at unstable.cc>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig
index bee034a95208..de8034d80623 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -35,7 +35,7 @@ config BATMAN_ADV
 	bool "B.A.T.M.A.N. V protocol (experimental)"
 	depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
-	default n
+	default y
 	  This option enables the B.A.T.M.A.N. V protocol, the successor
 	  of the currently used B.A.T.M.A.N. IV protocol. The main


More information about the linux-merge mailing list