]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Tue, 23 Oct 2018 17:55:09 +0000 (10:55 -0700)
committerDavid Ahern <dsahern@gmail.com>
Tue, 23 Oct 2018 17:55:09 +0000 (10:55 -0700)
commit6e221408e631414cf969f961d0d08f571fc7d0ac
tree9506631893c0380df6fa0554e5bcfcf58df9c3a7
parent35b857f9c6f1ff79ab333e13ae9637ee52b309bb
parent2808241af54f9584d40f5a2293ef1d36986dc8ec
Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/iproute.c
ip/iproute_lwtunnel.c
ip/xfrm_state.c
lib/utils.c
man/man8/ip-link.8.in