Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-21--00-00 (v6.18-rc6-1259-gd3b629137095) remotes/brancher/net-next-2025-11-21--03-00 (v6.18-rc6-1266-g1e6dfc7d5f85) ==== BASE DIFF ==== Documentation/networking/ip-sysctl.rst | 10 + .../net_cachelines/netns_ipv4_sysctl.rst | 3 +- drivers/net/bonding/bond_3ad.c | 9 + drivers/net/ethernet/freescale/fec.h | 30 +- drivers/net/ethernet/freescale/fec_main.c | 72 ++--- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/port.c | 1 + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 3 +- drivers/net/ethernet/stmicro/stmmac/common.h | 13 + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 4 +- .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 28 +- .../net/ethernet/stmicro/stmmac/dwmac-eic7700.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 5 +- .../net/ethernet/stmicro/stmmac/dwmac-loongson1.c | 12 +- .../ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 50 ++- drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 14 +- .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 10 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 30 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 30 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 11 +- drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 13 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 11 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 33 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 85 +++++- drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 39 +-- drivers/net/mdio/fwnode_mdio.c | 5 - drivers/net/netdevsim/netdev.c | 26 +- drivers/net/phy/adin1100.c | 7 +- drivers/net/phy/fixed_phy.c | 8 +- drivers/net/phy/mdio-private.h | 11 + drivers/net/phy/mdio_bus.c | 40 +-- drivers/net/phy/mdio_device.c | 54 ++++ drivers/net/phy/phy-caps.h | 1 + drivers/net/phy/phy-core.c | 4 +- drivers/net/phy/phy_caps.c | 2 + drivers/net/veth.c | 7 +- include/linux/stmmac.h | 6 +- include/net/netns/ipv4.h | 3 +- include/uapi/linux/ethtool.h | 5 + net/atm/common.c | 2 +- net/core/net_namespace.c | 11 +- net/ethtool/common.c | 8 + net/ipv4/sysctl_net_ipv4.c | 9 + net/ipv4/tcp_input.c | 18 +- net/ipv4/tcp_ipv4.c | 1 + tools/net/ynl/samples/.gitignore | 1 + tools/net/ynl/samples/Makefile | 1 + tools/net/ynl/samples/tc-filter-add.c | 335 +++++++++++++++++++++ tools/testing/selftests/drivers/net/.gitignore | 1 + tools/testing/selftests/drivers/net/Makefile | 2 + tools/testing/selftests/{ => drivers}/net/gro.c | 5 +- tools/testing/selftests/drivers/net/gro.py | 164 ++++++++++ tools/testing/selftests/drivers/net/hw/.gitignore | 1 + tools/testing/selftests/drivers/net/hw/Makefile | 6 +- .../selftests/drivers/net/hw/lib/py/__init__.py | 4 +- .../selftests/{net => drivers/net/hw}/toeplitz.c | 7 +- tools/testing/selftests/drivers/net/hw/toeplitz.py | 209 +++++++++++++ .../selftests/drivers/net/lib/py/__init__.py | 4 +- tools/testing/selftests/drivers/net/lib/py/env.py | 2 + tools/testing/selftests/drivers/net/xdp.py | 42 +-- tools/testing/selftests/net/.gitignore | 2 - tools/testing/selftests/net/Makefile | 7 - tools/testing/selftests/net/gro.sh | 105 ------- tools/testing/selftests/net/lib/Makefile | 1 + .../selftests/net/lib/ksft_setup_loopback.sh | 111 +++++++ tools/testing/selftests/net/lib/py/__init__.py | 5 +- tools/testing/selftests/net/lib/py/ksft.py | 89 +++++- tools/testing/selftests/net/lib/py/nsim.py | 2 +- tools/testing/selftests/net/lib/py/utils.py | 20 +- tools/testing/selftests/net/setup_loopback.sh | 120 -------- tools/testing/selftests/net/setup_veth.sh | 45 --- tools/testing/selftests/net/toeplitz.sh | 199 ------------ tools/testing/selftests/net/toeplitz_client.sh | 28 -- 79 files changed, 1328 insertions(+), 965 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.Np2aRvnoQy b/tmp/tmp.CFgZTgvoZR index 106c89be48fe..12ec336319c3 100644 --- a/tmp/tmp.Np2aRvnoQy +++ b/tmp/tmp.CFgZTgvoZR @@ -12,20 +12,16 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests nipa: fbnic: link up on QEMU +NFC: Fix error handling in nfc_genl_dump_targets +net: fix propagation of EPERM from tcp_connect() net: mana: Handle hardware recovery events when probing the device io_uring: Introduce getsockname io_uring cmd socket: Split out a getsockname helper for io_uring socket: Unify getsockname and getpeername implementation net: dsa: mt7530: fix active-low reset sequence ARM64: dts: mediatek: fix MT7531 reset GPIO polarity on multiple boards -ice: convert all ring stats to u64_stats_t -ice: shorten ring stat names and add accessors -ice: use u64_stats API to access pkts/bytes in dim sample -ice: remove ice_q_stats struct and use struct_group -ice: pass pointer to ice_fetch_u64_stats_per_ring -ice: initialize ring_stats->syncp -r8169: add support for RTL8127ATF -ipvs: fix ipv4 null-ptr-deref in route error path +tools: ynl-gen: add regeneration comment +tools: ynl-gen: add function prefix argument uapi: ioam6: adjust the maximum size of a schema doc/netlink: nftables: Fill out operation attributes doc/netlink: nftables: Add getcompat operation @@ -51,34 +47,13 @@ net: aquantia: Add missing descriptor cache invalidation on ATL2 dt-bindings: net: aspeed: add AST2700 MDIO compatible nfp: tls: Avoid -Wflex-array-member-not-at-end warnings vhost: rewind next_avail_head while discarding descriptors -selftests: net: remove old setup_* scripts -netdevsim: add loopback support -selftests: drv-net: hw: convert the Toeplitz test to Python -selftests: drv-net: add a Python version of the GRO test -netdevsim: pass packets thru GRO on Rx -selftests: net: py: read ip link info about remote dev -selftests: net: py: support ksft ready without wait -selftests: net: relocate gro and toeplitz tests to drivers/net -selftests: drv-net: xdp: use variants for qstat tests -selftests: net: py: add test variants -selftests: net: py: extract the case generation logic -selftests: net: py: coding style improvements virtio_net: enhance wake/stop tx queue statistics accounting -eth: fbnic: access @pp through netmem_desc instead of page netconsole: Increase MAX_USERDATA_ITEMS netconsole: Dynamic allocation of userdata buffer netconsole: Split userdata and sysdata netconsole: Simplify send_fragmented_body() -bonding: 3ad: Add support for 1600G speed -net/mlx5e: Add 1600Gbps link modes -net: ethtool: Add support for 1600Gbps speed -ynl: samples: add tc filter example -net: ipv4: fix spelling typo in comment -veth: reduce XDP no_direct return section to fix race team: Move team device type change at the end of team_port_add Documentation: net: add flow control guide and document ethtool API -net: phy: adin1100: Simplify register value passing -net: phy: adin1100: Fix software power-down ready condition hinic3: Add HW event handler hinic3: Add netdev notifier interfaces hinic3: Add mac filter ops @@ -88,30 +63,10 @@ hinic3: Add .ndo_set_features and .ndo_fix_features hinic3: Add .ndo_tx_timeout and .ndo_get_stats64 hinic3: Add PF management interfaces hinic3: Add PF framework -net: stmmac: rk: use phylink's interface mode for set_clk_tx_rate() net: enetc: update the base address of port MDIO registers for ENETC v4 net: enetc: set external PHY address in IERB for i.MX94 ENETC net: enetc: set the external PHY address in IERB for port MDIO usage -net: stmmac: remove axi_blen array -net: stmmac: move stmmac_axi_blen_to_mask() to axi_blen init sites -net: stmmac: move stmmac_axi_blen_to_mask() to stmmac_main.c -net: stmmac: provide common stmmac_axi_blen_to_mask() -net: stmmac: move common DMA AXI register bits to common.h -net: stmmac: dwc-qos-eth: simplify switch() in dwc_eth_dwmac_config_dt() -net: stmmac: rk: convert to init()/exit() methods -net: stmmac: move probe/remove calling of init/exit -net: stmmac: pass struct device to init()/exit() methods -net: atm: fix incorrect cleanup function call in error path -tcp: add net.ipv4.tcp_rcvbuf_low_rtt -tcp: tcp_moderate_rcvbuf is only used in rx path -net: phy: fixed_phy: fix missing initialization of fixed phy link -net: phy: fixed_phy: remove not needed initialization of phy_device members tools: ynl: add YNL test framework -net: fec: remove duplicate macros of the BD status -net: fec: remove rx_align from fec_enet_private -net: fec: remove struct fec_enet_priv_txrx_info -net: fec: simplify the conditional preprocessor directives -net: fec: remove useless conditional preprocessor directives selftest: netdevsim: test devlink default params netdevsim: register a new devlink param with default value interface net/mlx5: implement swp_l4_csum_mode via devlink params