commit | 0a6d10dbe903bf5d965357c2900530787c89bbaf | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Mon Oct 21 18:43:46 2013 -0400 |
committer | David S. Miller <davem@davemloft.net> | Mon Oct 21 18:43:46 2013 -0400 |
tree | f1f3b7615bf5db88cb29c5e9d89161717415d06f | |
parent | 3167fe98ce88ba617300443b54f45549b39417c5 [diff] | |
parent | fd2d5356d90211f98ea3624263e37c4142b41edd [diff] |
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 <davem@davemloft.net>