Merge branch 'iproute2-master' into iproute2-next

author David Ahern <dsahern@gmail.com>

Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)

committer David Ahern <dsahern@gmail.com>

Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)
author David Ahern <dsahern@gmail.com>
Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)
committer David Ahern <dsahern@gmail.com>
Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)
diff --cc bridge/fdb.c
Simple merge
diff --cc ip/ipaddrlabel.c
Simple merge
diff --cc lib/utils.c
Simple merge
author	David Ahern <dsahern@gmail.com>
	Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)
committer	David Ahern <dsahern@gmail.com>
	Mon, 22 Oct 2018 16:43:33 +0000 (09:43 -0700)
		1	2
bridge/fdb.c	patch \|	diff1 \|	diff2 \|	blob \| history
ip/ipaddrlabel.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history