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

Cross-merge networking fixes after downstream PR (net-6.12-rc3).

No conflicts and no adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
Simple merge

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

diff --cc drivers/net/ethernet/ibm/emac/mal.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/mediatek/airoha_eth.c
Simple merge

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

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

diff --cc drivers/net/ethernet/ti/icssg/icssg_prueth.c
Simple merge

diff --cc drivers/net/phy/aquantia/aquantia_main.c
Simple merge

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

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

diff --cc net/bridge/br_netfilter_hooks.c
Simple merge

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

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

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

diff --cc net/socket.c
Simple merge