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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Simple merge

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

diff --cc drivers/net/phy/phylink.c
Simple merge

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

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

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

diff --cc net/packet/af_packet.c
Simple merge

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

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