]> git.proxmox.com Git - mirror_iproute2.git/commit - include/utils.h
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Wed, 24 Jan 2018 17:59:03 +0000 (09:59 -0800)
committerDavid Ahern <dsahern@gmail.com>
Wed, 24 Jan 2018 17:59:03 +0000 (09:59 -0800)
commit6517b5c0ac13ac67d2f8f803f9038c96145c4612
tree08a53415aae2354c520d2dcdc5b5a8e471af0e96
parent3cb92eb9ab9f6a13015a1427b163f320c8c84b6f
parent7ac29190dbbc03ee2e60406ba8c584ac3c18c6c9
Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/iplink_vxlan.c
ip/iproute_lwtunnel.c
ip/link_gre.c
ip/link_gre6.c