]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Mon, 2 Apr 2018 17:47:34 +0000 (10:47 -0700)
committerDavid Ahern <dsahern@gmail.com>
Mon, 2 Apr 2018 17:47:34 +0000 (10:47 -0700)
commit2c62a64d60959e96f364a289df61308655abc99f
tree81b9deb2d879004efb03be4212df89788512da32
parent43eb8728b3915c797311fd03688aa1498e3195ef
parent4b6c4177ee66421770f0bbcc765c29135e44d921
Merge branch 'iproute2-master' into iproute2-next

Conflicts:
bridge/mdb.c
misc/ss.c
tc/tc.c

Signed-off-by: David Ahern <dsahern@gmail.com>
12 files changed:
ip/iplink.c
ip/iproute.c
ip/tunnel.c
lib/utils.c
man/man8/rdma.8
misc/nstat.c
misc/ss.c
tc/m_ematch.c
tc/m_nat.c
tc/m_pedit.c
tc/tc.c
tc/tc_class.c