Merge branch 'master' into net-next

author Stephen Hemminger <stephen@networkplumber.org>

Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)

committer Stephen Hemminger <stephen@networkplumber.org>

Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
author Stephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
committer Stephen Hemminger <stephen@networkplumber.org>
Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
diff --cc misc/ss.c
Simple merge
diff --cc tc/tc_qdisc.c
Simple merge
author	Stephen Hemminger <stephen@networkplumber.org>
	Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
committer	Stephen Hemminger <stephen@networkplumber.org>
	Mon, 13 Nov 2017 00:17:37 +0000 (16:17 -0800)
		1	2
misc/ss.c	patch \|	diff1 \|	diff2 \|	blob \| history
tc/tc_qdisc.c	patch \|	diff1 \|	diff2 \|	blob \| history