diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2012-05-23 17:33:47 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-14 21:47:45 -0700 |
| commit | fc5795c8a94c2d0b221dffae9ebb22686b3dafd8 (patch) | |
| tree | d21190545d42e2d783194ebdd34d451c3308099f | |
| parent | userns: Convert sock_i_uid to return a kuid_t (diff) | |
| download | linux-dev-fc5795c8a94c2d0b221dffae9ebb22686b3dafd8.tar.xz linux-dev-fc5795c8a94c2d0b221dffae9ebb22686b3dafd8.zip | |
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>
| -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 depends on PROC_EVENTS = n # Networking - depends on NET = n + depends on PACKET = n depends on NET_9P = n depends on IPX = n depends on PHONET = n |