Merge branch 'iproute2-master' into iproute2-next

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

diff --cc ip/iproute.c
Simple merge

diff --cc ip/iproute_lwtunnel.c
Simple merge

diff --cc ip/xfrm_state.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc man/man8/ip-link.8.in
Simple merge