From: David S. Miller Date: Mon, 21 Oct 2013 22:43:46 +0000 (-0400) Subject: Merge branch 'pernet_sysctls' X-Git-Tag: v3.13-rc1~105^2~152 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a6d10dbe903bf5d965357c2900530787c89bbaf;p=platform%2Fkernel%2Flinux-stable.git Merge branch 'pernet_sysctls' Eric W. Biederman says: ==================== ipv4: tcp_memcontrol and userns sysctls While looking into allowing the ipv4 sysctls to be used in a network namespace I stumbled upon the mess that is tcp_memcontrol. I remove the dead code, broken code, and excessive abstraction in the tcp_memcontrols then I clean up up and allow in the user namespace the per net ipv4 sysctls. ==================== Signed-off-by: David S. Miller --- 0a6d10dbe903bf5d965357c2900530787c89bbaf