Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --cc ip/iplink_vxlan.c
Simple merge

diff --cc ip/iproute_lwtunnel.c
Simple merge

diff --cc ip/link_gre.c
Simple merge

diff --cc ip/link_gre6.c
Simple merge