diff options
| author | David S. Miller <[email protected]> | 2015-04-07 21:29:47 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2015-04-07 21:29:47 +0000 |
| commit | 26ba9e8c3f455b1328d805937a320719cb152e80 (patch) | |
| tree | 2c9faf03479b4aaefe193c47b2c66061e95ddfcd /net/ipv4/tcp_output.c | |
| parent | Merge branch 'udp_tunnel_sk' (diff) | |
| parent | netns: allow to dump netns ids (diff) | |
| download | kernel-26ba9e8c3f455b1328d805937a320719cb152e80.tar.gz kernel-26ba9e8c3f455b1328d805937a320719cb152e80.zip | |
Merge branch 'netns-next'
Nicolas Dichtel says:
====================
netns: enhance netlink interface for nsid
The first patch is a small cleanup. The second patch implements notifications
for netns id events. And the last one allows to dump existing netns id from
userland.
iproute2 patches are available, I can send them on demand.
v2: drop the first patch (the fix is now in net-next)
====================
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/ipv4/tcp_output.c')
0 files changed, 0 insertions, 0 deletions