]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Thu, 10 May 2018 04:04:16 +0000 (21:04 -0700)
committerDavid Ahern <dsahern@gmail.com>
Thu, 10 May 2018 04:04:16 +0000 (21:04 -0700)
commit4aba7dc4f48211f97d890b349be3d050fba4f356
treef135bc01c5a6d18ff15803edb5c65ae6988a0829
parent7d40bdbc8d7aba43e4c416585cd889c169018d58
parent9b2ab68516aab1775c6bd07fd8bbd243ddc93225
Merge branch 'iproute2-master' into iproute2-next

 Conflicts:
rdma/include/uapi/rdma/rdma_netlink.h

Signed-off-by: David Ahern <dsahern@gmail.com>