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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/team/team.c
Simple merge

diff --cc include/linux/bpf.h
Simple merge

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

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

diff --cc tools/include/uapi/linux/bpf.h
Simple merge