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

Cross-merge networking fixes after downstream PR.

No conflicts, no adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/unix/af_unix.c
Simple merge