Merge branch 'master' into next

author David Ahern <dsahern@gmail.com>

Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)

committer David Ahern <dsahern@gmail.com>

Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)
author David Ahern <dsahern@gmail.com>
Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)
committer David Ahern <dsahern@gmail.com>
Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)
diff --cc devlink/devlink.c
Simple merge
diff --cc misc/ss.c
Simple merge
author	David Ahern <dsahern@gmail.com>
	Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)
committer	David Ahern <dsahern@gmail.com>
	Sat, 9 Nov 2019 00:38:37 +0000 (00:38 +0000)
		1	2
devlink/devlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/ss.c	patch \|	diff1 \|	diff2 \|	blob \| history