]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'tcp-Namespaceify-3-sysctls'
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 14:53:30 +0000 (10:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jun 2017 14:53:30 +0000 (10:53 -0400)
Eric Dumazet says:

====================
tcp: Namespaceify 3 sysctls

Move tcp_sack, tcp_window_scaling and tcp_timestamps
sysctls to network namespaces.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge