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

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

diff --cc drivers/net/ieee802154/mac802154_hwsim.c
Simple merge

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

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

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

diff --cc lib/rhashtable.c
Simple merge

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

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

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

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

diff --cc net/netlink/genetlink.c
Simple merge

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

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