diff --git a/[refs] b/[refs] index 75ce90b25563..eda7270c9209 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c5365bca33194092e0a094b34b268283022a1a1 +refs/heads/master: ecbacf8da78d9312e3ef5ccdbbbd547267092941 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index bf223fb4a86e..4f1f9741c71d 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -3252,15 +3252,14 @@ config NET_FC "SCSI generic support". config NETCONSOLE - tristate "Network console logging support (EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Network console logging support" ---help--- If you want to log kernel messages over the network, enable this. See for details. config NETCONSOLE_DYNAMIC - bool "Dynamic reconfiguration of logging targets (EXPERIMENTAL)" - depends on NETCONSOLE && SYSFS && EXPERIMENTAL + bool "Dynamic reconfiguration of logging targets" + depends on NETCONSOLE && SYSFS select CONFIGFS_FS help This option enables the ability to dynamically reconfigure target