]> www.infradead.org Git - users/willy/pagecache.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 14 Nov 2024 19:27:36 +0000 (11:27 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 14 Nov 2024 19:29:15 +0000 (11:29 -0800)
commita79993b5fce69e97f900bb975f6127e25cebf130
treef73ec541ca4183893a0bdc3d30f779c6999a0d9a
parent3d12862b216d39670500f6bd44b8be312b2ee4fb
parentcfaaa7d010d1fc58f9717fcc8591201e741d2d49
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

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

Conflicts:

tools/testing/selftests/net/.gitignore
  252e01e68241 ("selftests: net: add netlink-dumps to .gitignore")
  be43a6b23829 ("selftests: ncdevmem: Move ncdevmem under drivers/net/hw")
https://lore.kernel.org/all/20241113122359.1b95180a@canb.auug.org.au/

drivers/net/phy/phylink.c
  671154f174e0 ("net: phylink: ensure PHY momentary link-fails are handled")
  7530ea26c810 ("net: phylink: remove "using_mac_select_pcs"")

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
  5b366eae7193 ("stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines")
  e96321fad3ad ("net: ethernet: Switch back to struct platform_driver::remove()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
22 files changed:
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
drivers/net/bonding/bond_main.c
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c
drivers/net/ethernet/ti/icssg/icssg_prueth.c
drivers/net/phy/phylink.c
mm/page_alloc.c
net/core/filter.c
net/core/sock.c
net/ipv6/tcp_ipv6.c
net/mptcp/pm_netlink.c
net/mptcp/protocol.c
net/netlink/af_netlink.c
net/sctp/ipv6.c
net/vmw_vsock/af_vsock.c
tools/testing/selftests/net/.gitignore
tools/testing/selftests/net/Makefile