diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-23 19:33:47 -0400 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-15 00:47:45 -0400 |
| commit | fc5795c8a94c2d0b221dffae9ebb22686b3dafd8 (patch) | |
| tree | d21190545d42e2d783194ebdd34d451c3308099f /init | |
| parent | 976d020150456fccbd34103fd117fab910eed09c (diff) | |
userns: Allow USER_NS and NET simultaneously in Kconfig
Now that the networking core is user namespace safe allow
networking and user namespaces to be built at the same time.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 364b38dc8c35..80fae193e3a1 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -942,7 +942,7 @@ config UIDGID_CONVERTED | |||
| 942 | depends on PROC_EVENTS = n | 942 | depends on PROC_EVENTS = n |
| 943 | 943 | ||
| 944 | # Networking | 944 | # Networking |
| 945 | depends on NET = n | 945 | depends on PACKET = n |
| 946 | depends on NET_9P = n | 946 | depends on NET_9P = n |
| 947 | depends on IPX = n | 947 | depends on IPX = n |
| 948 | depends on PHONET = n | 948 | depends on PHONET = n |