Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-15--21-00 (v6.13-rc6-1201-g1b46e595d2ac) remotes/brancher/net-next-2025-01-16--00-00 (v6.13-rc6-1226-g0e86389b0625) ==== BASE DIFF ==== Documentation/netlink/specs/ethtool.yaml | 8 + Documentation/networking/ethtool-netlink.rst | 10 + drivers/net/dsa/b53/b53_serdes.c | 4 +- drivers/net/dsa/mt7530.c | 2 +- drivers/net/dsa/mv88e6xxx/pcs-6185.c | 1 + drivers/net/dsa/mv88e6xxx/pcs-6352.c | 1 + drivers/net/dsa/mv88e6xxx/pcs-639x.c | 5 +- drivers/net/dsa/qca/qca8k-8xxx.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 19 +- drivers/net/ethernet/broadcom/asp2/bcmasp.h | 3 - .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 39 -- drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 22 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 32 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 12 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 68 +++- drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 4 + drivers/net/ethernet/cadence/macb_main.c | 3 +- drivers/net/ethernet/freescale/fman/fman_dtsec.c | 4 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 + .../net/ethernet/marvell/prestera/prestera_main.c | 1 + drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 8 +- drivers/net/ethernet/meta/fbnic/Makefile | 1 + drivers/net/ethernet/meta/fbnic/fbnic.h | 5 + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 160 ++++++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 28 ++ drivers/net/ethernet/meta/fbnic/fbnic_hwmon.c | 81 ++++ drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 72 ++++ drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 7 + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 3 + drivers/net/ethernet/meta/fbnic/fbnic_phylink.c | 2 +- .../net/ethernet/microchip/lan966x/lan966x_main.h | 2 +- .../ethernet/microchip/lan966x/lan966x_phylink.c | 3 +- .../net/ethernet/microchip/lan966x/lan966x_port.c | 4 +- drivers/net/ethernet/microchip/sparx5/Kconfig | 1 + drivers/net/ethernet/microchip/sparx5/Makefile | 3 +- .../ethernet/microchip/sparx5/lan969x/lan969x.c | 4 + .../ethernet/microchip/sparx5/lan969x/lan969x.h | 7 + .../microchip/sparx5/lan969x/lan969x_fdma.c | 406 +++++++++++++++++++++ .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 68 ++-- .../net/ethernet/microchip/sparx5/sparx5_main.c | 19 +- .../net/ethernet/microchip/sparx5/sparx5_main.h | 32 +- .../net/ethernet/microchip/sparx5/sparx5_packet.c | 11 +- .../net/ethernet/microchip/sparx5/sparx5_phylink.c | 2 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- drivers/net/loopback.c | 5 +- drivers/net/netdevsim/ethtool.c | 12 +- drivers/net/netdevsim/netdev.c | 9 + drivers/net/netdevsim/netdevsim.h | 3 + drivers/net/pcs/pcs-lynx.c | 4 +- drivers/net/pcs/pcs-mtk-lynxi.c | 4 +- drivers/net/pcs/pcs-xpcs.c | 11 +- drivers/net/phy/phylink.c | 60 ++- include/linux/ethtool.h | 11 + include/linux/mroute_base.h | 6 +- include/linux/netdevice.h | 1 + include/linux/phylink.h | 11 +- include/uapi/linux/ethtool_netlink_generated.h | 2 + net/core/dev.c | 27 ++ net/core/devmem.c | 11 + net/ethtool/netlink.h | 2 +- net/ethtool/rings.c | 51 ++- net/ipv4/ipmr.c | 28 +- net/ipv4/ipmr_base.c | 6 +- net/ipv6/ip6mr.c | 28 +- net/mptcp/pm_userspace.c | 2 +- tools/testing/selftests/drivers/net/Makefile | 1 + tools/testing/selftests/drivers/net/hds.py | 120 ++++++ .../selftests/drivers/net/mlxsw/rif_bridge.sh | 1 + .../testing/selftests/drivers/net/mlxsw/rif_lag.sh | 1 + .../selftests/drivers/net/mlxsw/rif_lag_vlan.sh | 1 + tools/testing/selftests/net/forwarding/lib.sh | 4 + .../net/forwarding/mirror_gre_bridge_1q_lag.sh | 1 + .../net/forwarding/mirror_gre_lag_lacp.sh | 1 + .../net/forwarding/router_bridge_1d_lag.sh | 1 + .../selftests/net/forwarding/router_bridge_lag.sh | 1 + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 13 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 9 +- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 21 ++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 17 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 21 +- 81 files changed, 1449 insertions(+), 234 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.UUn8CmOFU5 b/tmp/tmp.yZufY7qskp index 370515135048..84269e4666a1 100644 --- a/tmp/tmp.UUn8CmOFU5 +++ b/tmp/tmp.yZufY7qskp @@ -2,13 +2,22 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +selftests/net: packetdrill: make tcp buf limited timing tests benign dsa: Use str_enable_disable-like helpers +net: homa: create Makefile and Kconfig +net: homa: create homa_plumbing.c and homa_utils.c +net: homa: create homa_timer.c +net: homa: create homa_outgoing.c +net: homa: create homa_incoming.c +net: homa: create homa_sock.h and homa_sock.c +net: homa: create homa_peer.h and homa_peer.c +net: homa: create homa_rpc.h and homa_rpc.c +net: homa: create homa_pool.h and homa_pool.c +net: homa: create shared Homa header files +net: homa: create homa_wire.h +net: homa: define user-visible API for Homa selftests: drv-net-hw: inject pp_alloc_fail errors in the right place net/rose: prevent integer overflows in rose_setsockopt() -net: ethernet: ti: am65-cpsw: streamline TX queue creation and cleanup -net: ethernet: ti: am65-cpsw: streamline RX queue creation and cleanup -net: ethernet: ti: am65-cpsw: streamline .probe() error handling -net: ethernet: am65-cpsw: call netif_carrier_on/off() when appropriate wireguard: allowedips: Add WGALLOWEDIP_F_REMOVE_ME flag xdp: remove xdp_alloc_skb_bulk() veth: use napi_skb_cache_get_bulk() instead of xdp_alloc_skb_bulk() @@ -57,43 +66,14 @@ net: stmmac: Convert prefetch() to net_prefetch() for received frames net: stmmac: Optimize cache prefetch in RX path net: stmmac: Set page_pool_params.max_len to a precise size net: stmmac: Switch to zero-copy in non-XDP RX path -tools: Sync if_xdp.h uapi tooling header -selftests/net/ipsec: Fix Null pointer dereference in rtattr_pack() tcp_cubic: fix incorrect HyStart round start detection -net: ethtool: mm: Allow Verify Enabled before Tx Enabled -inet: ipmr: fix data-races net: reduce RTNL hold duration in unregister_netdevice_many_notify() (part 2) net: reduce RTNL hold duration in unregister_netdevice_many_notify() (part 1) net: no longer hold RTNL while calling flush_all_backlogs() net: no longer assume RTNL is held in flush_all_backlogs() net: expedite synchronize_net() for cleanup_net() -mptcp: fix for setting remote ipv4mapped address -selftests: mptcp: connect: better display the files size -selftests: mptcp: connect: remove unused variable -selftests: mptcp: add -m with ss in case of errors -selftests: mptcp: move stats info in case of errors to lib.sh -selftests: mptcp: sockopt: save nstat infos -selftests: mptcp: simult_flows: unify errors msgs -net: bcm: asp2: convert to phylib managed EEE -net: bcm: asp2: remove tx_lpi_enabled -net: bcm: asp2: fix LPI timer handling -net: pcs: xpcs: actively unset DW_VR_MII_DIG_CTRL1_2G5_EN for 1G SGMII -net: pcs: xpcs: fix DW_VR_MII_DIG_CTRL1_2G5_EN bit being set for 1G SGMII w/o inband -octeon_ep_vf: remove firmware stats fetch in ndo_get_stats64 -octeon_ep_vf: update tx/rx stats locally for persistence -octeon_ep: remove firmware stats fetch in ndo_get_stats64 -octeon_ep: update tx/rx stats locally for persistence -net: loopback: Hold rtnl_net_lock() in blackhole_netdev_init(). netlink: support dumping IPv4 multicast addresses -selftests/net/forwarding: teamd command not found -net: appletalk: Drop aarp_send_probe_phase1() -net: phylink: provide fixed state for 1000base-X and 2500base-X -net: phylink: use neg_mode in phylink_mii_c22_pcs_decode_state() -net: phylink: pass neg_mode into c22 state decoder -net: phylink: pass neg_mode into .pcs_get_state() method -net: phylink: use pcs_neg_mode in phylink_mac_pcs_get_state() net: phy: micrel: Add KSZ87XX Switch LED control net: dsa: microchip: Add emulated MIIM access to switch LED config registers -net: ethernet: xgbe: re-add aneg to supported features in PHY quirks net: sched: fix ets qdisc OOB Indexing net/ncsi: Fix NULL pointer derefence if CIS arrives before SP