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

batman at open-mesh.org batman at open-mesh.org
Fri Jul 20 00:16:44 CEST 2018

The following commit has been merged in the master branch:
commit 951a06e78d5af9ffda9f00139fef1186c202f8ae
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat May 26 11:40:32 2018 +0200

    batman-adv: Drop "experimental" from BATMAN_V Kconfig
    The Kconfig option BATMAN_ADV_BATMAN_V is now enabled by default when the
    BATMAN_ADV is enabled. A feature which is enabled by default for a module
    should not be considered experimental.
    Reported-by: Joe Perches <joe at perches.com>
    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 de8034d80623..98c7f3820d53 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -33,7 +33,7 @@ config BATMAN_ADV
-	bool "B.A.T.M.A.N. V protocol (experimental)"
+	bool "B.A.T.M.A.N. V protocol"
 	depends on BATMAN_ADV && !(CFG80211=m && BATMAN_ADV=y)
 	default y


More information about the linux-merge mailing list