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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/flower/cmsg.c
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/tx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/drv.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/key/af_key.c
Simple merge

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

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