Merge branch 'master' into next

author David Ahern <dsahern@gmail.com>

Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)

committer David Ahern <dsahern@gmail.com>

Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)
author David Ahern <dsahern@gmail.com>
Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)
committer David Ahern <dsahern@gmail.com>
Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)
diff --cc ip/ip.c
Simple merge
diff --cc ip/ip6tunnel.c
Simple merge
diff --cc ip/ipnetns.c
Simple merge
author	David Ahern <dsahern@gmail.com>
	Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)
committer	David Ahern <dsahern@gmail.com>
	Fri, 14 Jun 2019 14:29:40 +0000 (07:29 -0700)
		1	2
ip/ip.c	patch \|	diff1 \|	diff2 \|	blob \| history
ip/ip6tunnel.c	patch \|	diff1 \|	diff2 \|	blob \| history
ip/ipnetns.c	patch \|	diff1 \|	diff2 \|	blob \| history