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

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/iavf/iavf_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

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

diff --cc drivers/net/ethernet/qlogic/qede/qede_fp.c
Simple merge

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

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

diff --cc drivers/net/wwan/iosm/iosm_ipc_imem.c
Simple merge

diff --cc drivers/net/wwan/iosm/iosm_ipc_imem.h
Simple merge

diff --cc drivers/net/wwan/iosm/iosm_ipc_imem_ops.c
Simple merge

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

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

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

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

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

diff --cc lib/Kconfig.debug
Simple merge

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

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

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

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

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

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc tools/testing/selftests/net/fcnal-test.sh
Simple merge