summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 21:08:43 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 21:08:43 +0300
commite579dde654fc2c6b0d3e4b77a9a4b2d2405c510e (patch)
treefe507a2904fb302e964831a5ed079cb58ee44c37 /net
parentaf82455f7dbd9dc20244d80d033721b30d22c065 (diff)
parentd66bb1607e2d8d384e53f3d93db5c18483c8c4f7 (diff)
downloadlinux-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace updates from Eric Biederman: "This is a set of small fixes that were mostly stumbled over during more significant development. This proc fix and the fix to posix-timers are the most significant of the lot. There is a lot of good development going on but unfortunately it didn't quite make the merge window" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Fix unbalanced hard link numbers signal: Make kill_proc_info static rlimit: Properly call security_task_setrlimit signal: Remove unused definition of sig_user_definied ia64: Remove unused IA64_TASK_SIGHAND_OFFSET and IA64_SIGHAND_SIGLOCK_OFFSET ipc: Remove unused declaration of recompute_msgmni posix-timers: Correct sanity check in posix_cpu_nsleep sysctl: Remove dead register_sysctl_root
Diffstat (limited to 'net')
-rw-r--r--net/sysctl_net.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 919981324171..9aed6fe1bf1a 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -106,7 +106,6 @@ __init int net_sysctl_init(void)
ret = register_pernet_subsys(&sysctl_pernet_ops);
if (ret)
goto out1;
- register_sysctl_root(&net_sysctl_root);
out:
return ret;
out1: