]> git.proxmox.com Git - mirror_iproute2.git/commit
Merge branch 'iproute2-master' into iproute2-next
authorDavid Ahern <dsahern@gmail.com>
Fri, 4 Jan 2019 20:22:47 +0000 (12:22 -0800)
committerDavid Ahern <dsahern@gmail.com>
Fri, 4 Jan 2019 20:22:47 +0000 (12:22 -0800)
commitdfa2c3787ff7e1509739561a7c13e585a6db2f9b
tree6a358dc6c439fc3fcd642c32ccb2e996f698440b
parent6267d9533bedbd148e5f2792876278cf6fa5d838
parentf0cabaca38e5fafb455373e2d2747afecc7299fd
Merge branch 'iproute2-master' into iproute2-next

Conflicts:
ip/iprule.c

Signed-off-by: David Ahern <dsahern@gmail.com>
ip/iprule.c
rdma/utils.c