Merge branch 'master' into next

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

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iproute.c
Simple merge

diff --cc misc/ss.c
Simple merge

diff --cc tc/q_netem.c
Simple merge