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

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


The following commit has been merged in the master branch:
commit 1ba93211e2042bdbecc54971929a97f2fb0ed25e
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 18 10:34:29 2018 +0100

    batman-adv: Disable CONFIG_BATMAN_ADV_DEBUGFS by default
    
    All tools which were known to the batman-adv development team are
    supporting the batman-adv netlink interface since a while. Also debugfs is
    not supported for batman-adv interfaces in any non-default netns. Thus
    disabling CONFIG_BATMAN_ADV_DEBUGFS by default should not cause problems on
    most systems. It is still possible to enable it in case it is still
    required in a specific setup.
    
    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 e4e2e02b7380..bee034a95208 100644
--- a/net/batman-adv/Kconfig
+++ b/net/batman-adv/Kconfig
@@ -94,13 +94,13 @@ config BATMAN_ADV_DEBUGFS
 	bool "batman-adv debugfs entries"
 	depends on BATMAN_ADV
 	depends on DEBUG_FS
-	default y
+	default n
 	help
 	  Enable this to export routing related debug tables via debugfs.
 	  The information for each soft-interface and used hard-interface can be
 	  found under batman_adv/
 
-	  If unsure, say Y.
+	  If unsure, say N.
 
 config BATMAN_ADV_DEBUG
 	bool "B.A.T.M.A.N. debugging"

-- 
LinuxNextTracking


More information about the linux-merge mailing list