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 arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hnae3.h
Simple merge

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

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

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

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

diff --cc drivers/net/netdevsim/ethtool.c
Simple merge

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

diff --cc drivers/net/usb/lan78xx.c
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/Kconfig
Simple merge

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

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

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

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

diff --cc net/mptcp/pm_netlink.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/sockopt.c
Simple merge

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

diff --cc net/smc/af_smc.c
Simple merge

diff --cc net/xdp/xsk.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge

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