From d01cd74bd2624c4d827137fbd5146379a812982a Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 2 Oct 2012 11:16:46 -0700 Subject: [PATCH] --- yaml --- r: 353517 b: refs/heads/master c: 75dacf5d808101af96866dd1fba1be1a58b77260 h: refs/heads/master i: 353515: 68bdfb8459a12aa144c47191ca6a0eaf1191aeae v: v3 --- [refs] | 2 +- trunk/arch/um/Kconfig.net | 2 +- trunk/arch/um/Kconfig.um | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 932f3e222e25..85e24ccac5ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b186ba6e0ff4e209a55afab5377622dcbf7f02e4 +refs/heads/master: 75dacf5d808101af96866dd1fba1be1a58b77260 diff --git a/trunk/arch/um/Kconfig.net b/trunk/arch/um/Kconfig.net index 3160b1a5adb7..820a56f00332 100644 --- a/trunk/arch/um/Kconfig.net +++ b/trunk/arch/um/Kconfig.net @@ -157,7 +157,7 @@ config UML_NET_MCAST config UML_NET_PCAP bool "pcap transport" - depends on UML_NET && EXPERIMENTAL + depends on UML_NET help The pcap transport makes a pcap packet stream on the host look like an ethernet device inside UML. This is useful for making diff --git a/trunk/arch/um/Kconfig.um b/trunk/arch/um/Kconfig.um index bf87f25eb2de..a7520c90f62d 100644 --- a/trunk/arch/um/Kconfig.um +++ b/trunk/arch/um/Kconfig.um @@ -45,8 +45,8 @@ config HOSTFS say Y or M here; otherwise say N. config HPPFS - tristate "HoneyPot ProcFS (EXPERIMENTAL)" - depends on EXPERIMENTAL && PROC_FS + tristate "HoneyPot ProcFS" + depends on PROC_FS help hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc entries to be overridden, removed, or fabricated from the host. @@ -96,7 +96,7 @@ config MAGIC_SYSRQ unless you really know what this hack does. config SMP - bool "Symmetric multi-processing support (EXPERIMENTAL)" + bool "Symmetric multi-processing support" default n depends on BROKEN help @@ -126,7 +126,7 @@ config NR_CPUS default "32" config HIGHMEM - bool "Highmem support (EXPERIMENTAL)" + bool "Highmem support" depends on !64BIT && BROKEN default n help