Merge branch 'master' into net-next

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iplink_can.c
Simple merge

diff --cc ip/iplink_vrf.c
Simple merge

diff --cc ip/iproute.c
Simple merge