Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-20--00-00 (v6.18-rc5-1333-g341993031db4) remotes/brancher/net-next-hw-2025-11-20--08-00 (v6.18-rc5-1313-g15e0d9f15169) ==== BASE DIFF ==== .../devicetree/bindings/net/mediatek,net.yaml | 26 +++- drivers/net/ethernet/intel/ice/ice_ptp.c | 22 ++- drivers/net/ethernet/intel/idpf/idpf_main.c | 2 + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 3 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 13 +- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 70 ++++++--- .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 48 ++++--- .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 11 ++ .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 90 +++++++----- .../net/ethernet/mellanox/mlx5/core/sf/hw_table.c | 61 ++++---- drivers/net/ethernet/mellanox/mlx5/core/sf/sf.h | 20 ++- .../ethernet/mellanox/mlx5/core/sf/vhca_event.c | 69 ++++----- .../ethernet/mellanox/mlx5/core/sf/vhca_event.h | 5 + drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 47 +++++- drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 + drivers/net/phy/realtek/realtek_main.c | 159 +++++++++++++-------- drivers/net/vmxnet3/vmxnet3_ethtool.c | 18 +-- include/linux/mlx5/driver.h | 10 +- include/net/mana/gdma.h | 8 +- include/net/mana/mana.h | 2 + net/core/skbuff.c | 20 +-- net/mptcp/options.c | 54 ++++++- net/mptcp/pm_kernel.c | 2 +- net/mptcp/protocol.c | 59 +++++--- net/mptcp/protocol.h | 3 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 27 ++-- 28 files changed, 583 insertions(+), 281 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.sgfzOvgc7o b/tmp/tmp.Wig5kqiQCi index 730b5ac775a6..74e0cf716ef8 100644 --- a/tmp/tmp.sgfzOvgc7o +++ b/tmp/tmp.Wig5kqiQCi @@ -14,24 +14,22 @@ 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 +nfp: tls: Avoid -Wflex-array-member-not-at-end warnings +vhost: rewind next_avail_head while discarding descriptors +virtio_net: enhance wake/stop tx queue statistics accounting +eth: fbnic: access @pp through netmem_desc instead of page +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 devlink: Notify eswitch mode changes to devlink monitor veth: reduce XDP no_direct return section to fix race team: Move team device type change at the end of team_port_add -idpf: use desc_ring when checking completion queue DMA allocation Documentation: net: add flow control guide and document ethtool API vsock: Ignore signal/timeout on connect() if already established net: phy: adin1100: Simplify register value passing net: phy: adin1100: Fix software power-down ready condition -ptp: ptp_ines: add HW timestamp configuration reporting -net: phy: nxp-c45-tja11xx: add HW timestamp configuration reporting -phy: mscc: add HW timestamp configuration reporting -net: phy: microchip_rds_ptp: add HW timestamp configuration reporting -net: phy: micrel: add HW timestamp configuration reporting -net: phy: dp83640: add HW timestamp configuration reporting -net: phy: broadcom: add HW timestamp configuration reporting -phy: add hwtstamp_get callback to phy drivers -phy: rename hwtstamp callback to hwtstamp_set hinic3: Add HW event handler hinic3: Add netdev notifier interfaces hinic3: Add mac filter ops @@ -58,7 +56,6 @@ 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 -amd-xgbe: let the MAC manage PHY PM 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 @@ -69,13 +66,6 @@ netconsole: convert 'enabled' flag to enum for clearer state management netconsole: add target_state enum net: phy: fixed_phy: fix missing initialization of fixed phy link net: phy: fixed_phy: remove not needed initialization of phy_device members -net: wwan: mhi: Add network support for Foxconn T99W760 -eea: introduce ethtool support -eea: create/destroy rx,tx queues for netdevice open and stop -eea: probe the netdevice and create adminq -eea: introduce ring and descriptor structures -eea: introduce PCI framework -netfilter: conntrack: Add missing modification about data-race around ct->timeout tools: ynl: add YNL test framework net: fec: remove duplicate macros of the BD status net: fec: remove rx_align from fec_enet_private @@ -88,25 +78,6 @@ net/mlx5: implement swp_l4_csum_mode via devlink params devlink: support default values for param-get and param-set devlink: refactor devlink_nl_param_value_fill_one() devlink: pass extack through to devlink_param::get() -ice: fix PTP cleanup on driver removal in error path -idpf: fix possible vport_config NULL pointer deref in remove -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 -net: dsa: microchip: Fix symetry in ksz_ptp_msg_irq_{setup/free}() -net: dsa: microchip: Free previously initialized ports on init failures -net: dsa: microchip: Don't free uninitialized ksz_irq -net: dsa: microchip: ptp: Fix checks on irq_find_mapping() -net: dsa: microchip: common: Fix checks on irq_find_mapping() tools: ynl: cli: Display enum values in --list-attrs output tools: ynl: cli: Parse nested attributes in --list-attrs output tools: ynl: cli: Add --list-attrs option to show operation attributes @@ -119,8 +90,6 @@ 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: vmxnet3: convert to use .get_rx_ring_count -virtio_net: enhance wake/stop tx queue statistics accounting net: bonding: move bond_should_notify_peers, e.g. into rtnl lock block net: bonding: use workqueue to make sure peer notify updated in lacp mode net: txgbe: support getting module EEPROM by page @@ -128,39 +97,10 @@ net: txgbe: delay to identify modules in .ndo_open net: txgbe: improve functions of AML 40G devices net: txgbe: rename the SFP related net: txgbe: support CR modules for AML devices -selftests: mptcp: add a check for 'add_addr_accepted' -mptcp: fix address removal logic in mptcp_pm_nl_rm_addr -selftests: mptcp: join: userspace: longer timeout -selftests: mptcp: join: endpoints: longer timeout -selftests: mptcp: join: fastclose: remove flaky marks -mptcp: fix duplicate reset on fastclose -mptcp: decouple mptcp fastclose from tcp close -mptcp: do not fallback when OoO is present -mptcp: fix premature close in case of fallback -mptcp: avoid unneeded subflow-level drops -mptcp: fix ack generation for fallback msk -net: prefetch the next skb in napi_skb_cache_get() -net: use NAPI_SKB_CACHE_FREE to keep 32 as default to do bulk free -net: increase default NAPI_SKB_CACHE_BULK to 32 -net: increase default NAPI_SKB_CACHE_SIZE to 128 -octeontx2-af: Skip TM tree print for disabled SQs net: phy: microchip_t1s: add SQI support for LAN867x Rev.D0 PHYs net: phy: phy-c45: add SQI and SQI+ support for OATC14 10Base-T1S PHYs atm/fore200e: Fix possible data race in fore200e_open() l2tp: reset skb control buffer on xmit -net: phy: realtek: create rtl8211f_config_phy_eee() helper -net: phy: realtek: eliminate priv->phycr1 variable -net: phy: realtek: allow CLKOUT to be disabled on RTL8211F(D)(I)-VD-CG -net: phy: realtek: eliminate has_phycr2 variable -net: phy: realtek: eliminate priv->phycr2 variable -net: phy: realtek: create rtl8211f_config_rgmii_delay() net/rds: Give each connection its own workqueue net/rds: Add per cp work queue -dt-bindings: net: aspeed: add AST2700 MDIO compatible -net/mlx5: Move SF dev table notifier registration outside the PF devlink lock -net/mlx5: Move the SF table notifiers outside the devlink lock -net/mlx5: Move the SF HW table notifier outside the devlink lock -net/mlx5: Move the vhca event notifier outside of the devlink lock -net/mlx5: Move the esw mode notifier chain outside the devlink lock -net/mlx5: Initialize events outside devlink lock net: dsa: microchip: lan937x: Fix RGMII delay tuning