From: David Ahern <dsahern@gmail.com>
Date: Thu, 10 May 2018 04:04:16 +0000 (-0700)
Subject: Merge branch 'iproute2-master' into iproute2-next
X-Git-Tag: v4.18.0~24^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aba7dc4f48211f97d890b349be3d050fba4f356;p=thirdparty%2Fiproute2.git

Merge branch 'iproute2-master' into iproute2-next

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

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

4aba7dc4f48211f97d890b349be3d050fba4f356