Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-10-28--09-00 (v6.18-rc2-623-g68ffc62eee00) remotes/brancher/net-next-2025-10-28--12-00 (v6.18-rc2-608-gcddfbbe71514) ==== BASE DIFF ==== drivers/net/ethernet/mellanox/mlx5/core/dev.c | 12 +- .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 7 +- .../net/ethernet/mellanox/mlx5/core/en/mapping.c | 13 +- .../net/ethernet/mellanox/mlx5/core/en/mapping.h | 3 +- .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 6 +- .../ethernet/mellanox/mlx5/core/en/tc/int_port.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 11 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 32 ++--- .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 6 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 4 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 19 ++- .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 23 +++- .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 19 +++ drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 61 ++++++++- drivers/net/ethernet/wangxun/libwx/wx_hw.c | 69 +++++++++- drivers/net/ethernet/wangxun/libwx/wx_lib.c | 143 +++++++++++++++++++-- drivers/net/ethernet/wangxun/libwx/wx_sriov.c | 4 + drivers/net/ethernet/wangxun/libwx/wx_type.h | 47 ++++++- drivers/net/ethernet/wangxun/libwx/wx_vf.h | 4 + drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c | 12 ++ drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 5 + .../net/ethernet/wangxun/txgbevf/txgbevf_main.c | 12 ++ include/linux/mlx5/driver.h | 3 + 26 files changed, 450 insertions(+), 85 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.q8ORDk0GXy b/tmp/tmp.mRLLvEjuid index be1844990963..a4914690f974 100644 --- a/tmp/tmp.q8ORDk0GXy +++ b/tmp/tmp.mRLLvEjuid @@ -12,6 +12,10 @@ 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 +mptcp: zero window probe mib +mptcp: restore window probe +mptcp: fix MSG_PEEK stream corruption +mptcp: drop bogus optimization in __mptcp_check_push() net/mlx5e: SHAMPO, Fix header formulas for higher MTUs and 64K pages net/mlx5e: SHAMPO, Fix skb size check for 64K pages net/mlx5e: SHAMPO, Fix header mapping for 64K pages @@ -36,11 +40,6 @@ net: stmmac: Consider Tx VLAN offload tag length for maxSDU net: stmmac: vlan: Disable 802.1AD tag insertion offload virtio-net: calculate header alignment mask based on features Documentation: ARCnet: Update obsolete contact info -netdevsim: implement psp device stats -net/mlx5e: Add PSP stats support for Rx/Tx flows -psp: add stats from psp spec to driver facing api -selftests: drv-net: psp: add assertions on core-tracked psp dev stats -psp: report basic stats from the core net/smc: handle -ENOMEM from smc_wr_alloc_link_mem gracefully net/smc: make wr buffer count configurable veth: more robust handing of race to avoid txq getting stuck @@ -170,30 +169,6 @@ netrom: Preventing the use of abnormal neighbor selftests/bpf: Add mptcp test with sockmap bpf,sockmap: disallow MPTCP sockets from sockmap net,mptcp: fix proto fallback detection with BPF sockmap -net: ti: icssg-prueth: Enable zero copy in XDP features -net: ti: icssg-prueth: Add AF_XDP zero copy for RX -net: ti: icssg-prueth: Make emac_run_xdp function independent of page -net: ti: icssg-prueth: Add AF_XDP zero copy for TX -net: ti: icssg-prueth: Add XSK pool helpers -net: ti: icssg-prueth: Add functions to create and destroy Rx/Tx queues -net/mlx5: Add balance ID support for LAG multiplane groups -net/mlx5: Refactor HCA cap 2 setting -net/mlx5: Refactor PTP clock devcom pairing -net/mlx5: Add software system image GUID infrastructure -net/mlx5: Use common mlx5_same_hw_devs function -net/mlx5e: Defer channels closure to reduce interface down time -net/mlx5e: Pass old channels as argument to mlx5e_switch_priv_channels -net/mlx5e: Do not re-apply TIR loopback configuration if not necessary -net/mlx5: IPoIB, set self loopback prevention in TIR init -net/mlx5e: Allow setting self loopback prevention bits on TIR init -net/mlx5e: Use TIR API in mlx5e_modify_tirs_lb() -net/mlx5e: Enhance function structures for self loopback prevention application -net: txgbe: support RSC offload -net: txgbe: support TX head write-back mode -net: txgbe: support RX desc merge mode -gve: Default to max_rx_buffer_size for DQO if device supported -gve: Allow ethtool to configure rx_buf_len -gve: Decouple header split from RX buffer length net: mdio: reset PHY before attempting to access registers in fwnode_mdiobus_register_phy net: mdio: introduce mdio_device_has_reset() net: mdio: change property read from fwnode_property_read_u32() to device_property_read_u32()