Merge branch 'iproute2-master' into iproute2-next

author David Ahern <dsahern@gmail.com>

Mon, 13 Aug 2018 14:46:26 +0000 (07:46 -0700)

committer David Ahern <dsahern@gmail.com>

Mon, 13 Aug 2018 14:47:21 +0000 (07:47 -0700)
author David Ahern <dsahern@gmail.com>
Mon, 13 Aug 2018 14:46:26 +0000 (07:46 -0700)
committer David Ahern <dsahern@gmail.com>
Mon, 13 Aug 2018 14:47:21 +0000 (07:47 -0700)
diff --cc ip/ipaddress.c
Simple merge
diff --cc tc/tc.c
Simple merge
author	David Ahern <dsahern@gmail.com>
	Mon, 13 Aug 2018 14:46:26 +0000 (07:46 -0700)
committer	David Ahern <dsahern@gmail.com>
	Mon, 13 Aug 2018 14:47:21 +0000 (07:47 -0700)
		1	2
ip/ipaddress.c	patch \|	diff1 \|	diff2 \|	blob \| history
tc/tc.c	patch \|	diff1 \|	diff2 \|	blob \| history