Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-09-27--00-00 (v6.17-rc7-1774-g7b2c8163c76a) remotes/brancher/net-next-hw-2025-09-27--08-00 (v6.17-rc7-1783-ga0f7035bcbb4) ==== BASE DIFF ==== .../devicetree/bindings/net/cdns,macb.yaml | 2 +- Documentation/netlink/specs/ethtool.yaml | 29 ++ Documentation/networking/ethtool-netlink.rst | 5 + drivers/net/ethernet/airoha/airoha_npu.c | 24 +- drivers/net/ethernet/airoha/airoha_ppe.c | 19 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 +- drivers/net/ethernet/cadence/macb.h | 4 - drivers/net/ethernet/cadence/macb_main.c | 138 +++-- .../net/ethernet/fungible/funeth/funeth_ethtool.c | 3 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 3 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 4 +- .../net/ethernet/marvell/octeon_ep/octep_ethtool.c | 10 + .../marvell/octeon_ep_vf/octep_vf_ethtool.c | 10 + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 8 + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 127 ++++- drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 3 +- drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 4 +- drivers/net/ethernet/sfc/ethtool.c | 3 +- drivers/net/ethernet/sfc/siena/ethtool.c | 3 +- drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 33 ++ drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 1 + drivers/net/ethernet/wangxun/ngbevf/ngbevf_main.c | 4 + .../net/ethernet/wangxun/txgbevf/txgbevf_main.c | 4 + drivers/net/netdevsim/ethtool.c | 25 +- drivers/net/phy/micrel.c | 2 +- drivers/vhost/vringh.c | 7 +- include/linux/ethtool.h | 25 +- include/linux/soc/airoha/airoha_offload.h | 7 +- include/uapi/linux/ethtool_netlink_generated.h | 12 + include/uapi/linux/mptcp.h | 11 +- net/ethtool/fec.c | 75 ++- net/mptcp/pm.c | 32 +- net/mptcp/pm_kernel.c | 569 ++++++++++++++------- net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 21 +- net/mptcp/sockopt.c | 22 +- tools/testing/selftests/bpf/progs/mptcp_subflow.c | 2 +- .../drivers/net/mlxsw/devlink_trap_policer.sh | 9 +- .../selftests/drivers/net/mlxsw/qos_ets_strict.sh | 12 +- .../drivers/net/mlxsw/qos_max_descriptors.sh | 9 +- .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 12 +- .../selftests/drivers/net/mlxsw/sch_red_core.sh | 6 +- tools/testing/selftests/drivers/net/stats.py | 35 +- tools/testing/selftests/net/fdb_notify.sh | 26 +- tools/testing/selftests/net/forwarding/README | 15 + .../net/forwarding/bridge_activity_notify.sh | 21 +- .../net/forwarding/bridge_fdb_local_vlan_0.sh | 65 ++- tools/testing/selftests/net/forwarding/lib.sh | 18 + .../selftests/net/forwarding/sch_ets_core.sh | 9 +- tools/testing/selftests/net/forwarding/sch_red.sh | 12 +- .../selftests/net/forwarding/sch_tbf_core.sh | 6 +- .../net/forwarding/vxlan_bridge_1q_mc_ul.sh | 141 +++-- .../selftests/net/forwarding/vxlan_reserved.sh | 33 +- tools/testing/selftests/net/lib.sh | 16 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 11 + .../selftests/net/test_vxlan_fdb_changelink.sh | 8 +- tools/testing/selftests/net/vlan_bridge_binding.sh | 44 +- 60 files changed, 1177 insertions(+), 596 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.B9ArFUZ9A8 b/tmp/tmp.XcWyq3trgK index bc82b1a652d6..e1d2f0a5f726 100644 --- a/tmp/tmp.B9ArFUZ9A8 +++ b/tmp/tmp.XcWyq3trgK @@ -34,51 +34,10 @@ scm: use masked_user_access_begin() in put_cmsg() atm: Fix the cleanup on alloc_mpc failure in atm_mpoa_mpoad_attach net: stmmac: Add support for Allwinner A523 GMAC200 dt-bindings: net: sun8i-emac: Add A523 GMAC200 compatible -selftests: forwarding: README: Mention defer, adf_ -selftests: forwarding: lib: Add an autodefer variant of forwarding_enable() -selftests: forwarding: lib: Add an autodefer variant of simple_if_init() -selftests: forwarding: lib: Add an autodefer variant of vrf_prepare() -selftests: net: vlan_bridge_binding: Rename dfr_set_binding_*() to adf_* -selftests: net: lib: Rename bridge_vlan_add() to adf_* -selftests: net: lib: Rename ip_route_add() to adf_* -selftests: net: lib: Rename ip_addr_add() to adf_* -selftests: net: lib: Rename ip_link_set_down() to adf_* -selftests: net: lib: Rename ip_link_set_up() to adf_* -selftests: net: lib: Rename ip_link_set_addr() to adf_* -selftests: net: lib: Rename ip_link_set_master() to adf_* -selftests: net: lib: Rename ip_link_add() to adf_* tipc: adjust tipc_nodeid2string() to check the length of the result net: stmmac: tc: Add HLBS drop count to taprio stats net: stmmac: est: Drop frames causing HLBS error net: nfc: nci: Add parameter validation for packet data -octeon_ep_vf: Add support to retrieve hardware channel information -octeon_ep: Add support to retrieve hardware channel information net/mlx5: Expose uar access and odp page fault counters -mptcp: pm: in-kernel: add laminar endpoints -mptcp: pm: in-kernel: compare IDs instead of addresses -mptcp: pm: in-kernel: reduce pernet struct size -mptcp: pm: in-kernel: remove stale_loss_cnt -mptcp: pm: in-kernel: rename 'addrs' to 'endpoints' -mptcp: pm: in-kernel: rename 'local_addr_list' to 'endp_list' -mptcp: pm: in-kernel: rename 'local_addr_max' to 'endp_subflow_max' -mptcp: pm: in-kernel: rename 'add_addr_accept_max' to 'limit_add_addr_accepted' -mptcp: pm: in-kernel: rename 'add_addr_signal_max' to 'endp_signal_max' -mptcp: pm: in-kernel: rename 'subflows_max' to 'limit_extra_subflows' -mptcp: pm: rename 'subflows' to 'extra_subflows' -mptcp: pm: in-kernel: refactor fill_remote_addresses_vec -mptcp: pm: in-kernel: refactor fill_local_addresses_vec -selftests: mptcp: join: validate C-flag + def limit -mptcp: pm: in-kernel: usable client side with C-flag -net: phy: micrel: Fix lan8814_config_init -vhost: vringh: Fix copy_to_iter return value check 6pack: drop redundant locking and refcounting -net: airoha: npu: Add a NPU callback to initialize flow stats -eth: fbnic: Add support to read lane count -net: stmmac: Convert open-coded register polling to helper macro -selftests: net-drv: stats: sanity check FEC histogram -net/mlx5e: Report RS-FEC histogram statistics via ethtool -net/mlx5e: Add logic to read RS-FEC histogram bin ranges from PPHCR -net/mlx5e: Don't query FEC statistics when FEC is disabled -ethtool: add FEC bins histogram report Documentation: net: add flow control guide and document ethtool API -Wangxun: vf: Implement some ethtool apis for get_xxx