Cross-merge networking fixes after downstream PR (net-6.12-rc8). Conflicts: tools/testing/selftests/net/.gitignore 252e01e6 ("selftests: net: add netlink-dumps to .gitignore") be43a6b2 ("selftests: ncdevmem: Move ncdevmem under drivers/net/hw") https://lore.kernel.org/all/20241113122359.1b95180a@canb.auug.org.au/ drivers/net/phy/phylink.c 671154f1 ("net: phylink: ensure PHY momentary link-fails are handled") 7530ea26 ("net: phylink: remove "using_mac_select_pcs"") Adjacent changes: drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c 5b366eae ("stmmac: dwmac-intel-plat: fix call balance of tx_clk handling routines") e96321fa ("net: ethernet: Switch back to struct platform_driver::remove()") Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Loading
Please sign in to comment