Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

diff --cc include/net/tcp.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/inet_connection_sock.c
Simple merge

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/ipv6/ip6_tunnel.c
Simple merge

diff --cc net/sched/sch_generic.c
Simple merge

diff --cc net/smc/smc_tx.c
Simple merge