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

No conflicts.

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

diff --cc Documentation/networking/ip-sysctl.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/riscv/boot/dts/microchip/mpfs.dtsi
Simple merge

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

diff --cc drivers/net/can/rcar/rcar_canfd.c
Simple merge

diff --cc drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/intel/igc/igc_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igc/igc_regs.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_flower.c
Simple merge

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

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

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

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

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

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

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

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

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

diff --cc net/ipv4/esp4.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.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc net/tls/tls_device.c
Simple merge