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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_netdev.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/switchx2.c
Simple merge

diff --cc drivers/net/ethernet/qualcomm/emac/emac.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

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

diff --cc include/uapi/linux/nl80211.h
Simple merge

diff --cc include/uapi/linux/pkt_cls.h
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

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

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

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

diff --cc net/mac80211/chan.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/vht.c
Simple merge

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

diff --cc net/tipc/link.c
Simple merge

diff --cc net/tipc/msg.h
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge