summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-05-25 16:14:15 -0400
committerJosh Boyer <jwboyer@redhat.com>2012-05-25 16:14:15 -0400
commit1f83f3a2352f83f2718e6b0a97e1f0737721135a (patch)
tree3985dc9154747d99b114bc184e8b50b70b70fc4a /config-generic
parent84cbbf27f735afcd21dbb28052cba9c13172eeaf (diff)
downloadkernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.tar.gz
kernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.tar.xz
kernel-1f83f3a2352f83f2718e6b0a97e1f0737721135a.zip
Drop CONFIG_USER_NS
Upstream e1c972b681bf118fcedb9fe2ed7a73de983aa5ef makes it depend on UIDGID_CONVERTED which is only set when all of the subsystems have been converted to be user namespace safe. That defaults to Y whenever it happens, so we'll set this after that point.
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index beaa3e09b..ca9855af9 100644
--- a/config-generic
+++ b/config-generic
@@ -52,7 +52,6 @@ CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
CONFIG_CFQ_GROUP_IOSCHED=y
CONFIG_DEFAULT_CFQ=y
-CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y