Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-02-26--03-00 (v6.14-rc3-888-g3eb12b806289) remotes/brancher/net-next-2025-02-26--06-00 (v6.14-rc3-894-g0706c93073a6) ==== BASE DIFF ==== Documentation/networking/ethtool-netlink.rst | 2 +- Documentation/networking/scaling.rst | 15 ++- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 10 +- drivers/net/ethernet/cisco/enic/Kconfig | 1 + drivers/net/ethernet/freescale/enetc/enetc.c | 103 +++++++++++++++------ drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 2 +- .../net/ethernet/freescale/enetc/enetc_ethtool.c | 7 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 2 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 12 ++- drivers/net/ethernet/intel/ice/ice_eswitch.c | 3 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +- drivers/net/ethernet/intel/ice/ice_sriov.c | 5 +- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 8 ++ .../net/ethernet/intel/ice/ice_vf_lib_private.h | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 2 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 14 ++- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en/rss.c | 13 ++- drivers/net/ethernet/mellanox/mlx5/core/en/rss.h | 4 +- .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 11 ++- .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en/tir.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en/tir.h | 1 + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 17 +++- .../net/ethernet/mellanox/mlx5/core/esw/legacy.c | 2 +- .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.c | 6 +- .../net/ethernet/mellanox/mlx5/core/fs_ft_pool.h | 2 - .../ethernet/mellanox/mlx5/core/lib/fs_chains.c | 3 +- .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 53 ++++++----- drivers/net/ethernet/wangxun/Kconfig | 2 + include/linux/ethtool.h | 5 +- include/linux/mlx5/device.h | 1 + include/linux/mlx5/fs.h | 2 + include/linux/mlx5/mlx5_ifc.h | 1 + include/linux/socket.h | 2 + include/uapi/linux/ethtool.h | 4 + include/uapi/linux/rtnetlink.h | 1 + net/core/scm.c | 10 ++ net/ethtool/ioctl.c | 8 +- net/ipv4/tcp.c | 26 ++---- net/mptcp/pm_netlink.c | 5 - net/mptcp/protocol.h | 2 + net/mptcp/subflow.c | 15 +-- tools/testing/selftests/drivers/net/hw/Makefile | 1 + .../selftests/drivers/net/hw/rss_input_xfrm.py | 87 +++++++++++++++++ tools/testing/selftests/net/ip_local_port_range.sh | 4 +- tools/testing/selftests/net/lib/py/utils.py | 17 +--- 47 files changed, 349 insertions(+), 154 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.sqKzXtJdHn b/tmp/tmp.kfbr2Cj3vv index dad04f8997a3..7191e8b42e81 100644 --- a/tmp/tmp.sqKzXtJdHn +++ b/tmp/tmp.kfbr2Cj3vv @@ -3,6 +3,8 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +net/mlx5e: Avoid a hundred -Wflex-array-member-not-at-end warnings +dpll: Add an assertion to check freq_supported_num ppp: Fix KMSAN warning by initializing 2-byte header gve: unlink old napi when stopping a queue using queue API net: enetc: Support ethernet aliases in dts. @@ -40,8 +42,6 @@ virtio-net: Use persistent NAPI config virtio-net: Map NAPIs to queues virtio-net: Refactor napi_disable paths virtio-net: Refactor napi_enable paths -enic: add dependency on Page Pool -Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux tsnep: Add loopback selftests net: selftests: Add selftests sets with fixed speed net: selftests: Support selftest sets @@ -50,14 +50,6 @@ net: phy: marvell: Align set_loopback() implementation net: phy: micrel: Add loopback support net: phy: Support speed selection for PHY loopback net: phy: Allow loopback speed selection for PHY drivers -ixgbe: fix media cage present detection for E610 device -iavf: fix circular lock dependency with netdev_lock -idpf: synchronize pending IRQs after disable -ice: Avoid setting default Rx VSI twice in switchdev setup -ice: Fix deinitializing VF in error path -mptcp: safety check before fallback -mptcp: reset when MPTCP opts are dropped after join -mptcp: always handle address removal under msk socket lock eth: bnxt: remove most dependencies on RTNL docs: net: document new locking reality net: add option to request netdev instance lock @@ -70,24 +62,7 @@ net: hold netdev instance lock during rtnetlink operations net: hold netdev instance lock during queue operations net: hold netdev instance lock during ndo_setup_tc net: hold netdev instance lock during ndo_open/ndo_stop -selftests: drv-net-hw: Add a test for symmetric RSS hash -selftests: drv-net: Make rand_port() get a port more reliably -net/mlx5e: Symmetric OR-XOR RSS hash control -ethtool: Symmetric OR-XOR RSS hash -tcp: devmem: don't write truncated dmabuf CMSGs to userspace usbnet: gl620a: fix endpoint checking in genelink_bind() -net: stmmac: dwc-qos: clean up clock initialisation -net: stmmac: dwc-qos: name struct plat_stmmacenet_data consistently -net: wangxun: fix LIBWX dependencies -drivers: net: xgene: Don't use "proxy" headers -net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() -net: enetc: remove the mm_lock from the ENETC v4 driver -net: enetc: add missing enetc4_link_deinit() -net: enetc: update UDP checksum when updating originTimestamp field -net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC -net: enetc: correct the xdp_tx statistics -net: enetc: keep track of correct Tx BD count in enetc_map_tx_tso_buffs() -net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() net: airoha: Introduce PPE debugfs support net: airoha: Add loopback support for GDM2 net: airoha: Introduce flowtable offload support @@ -104,8 +79,6 @@ net: airoha: Move reg/write utility routines in airoha_eth.h net: airoha: Move definitions in airoha_eth.h net: airoha: Move airoha_eth driver in a dedicated folder net: ipv6: fix TCP GSO segmentation with NAT -Add OVN to `rtnetlink.h` -selftests/net: ensure mptcp is enabled in netns selftest: net: add proc_net_pktgen net: pktgen: remove all superfluous index assignements net: pktgen: fix mpls reset parsing @@ -115,7 +88,4 @@ net: pktgen: remove some superfluous variable initializing net: pktgen: remove extra tmp variable (re-use len instead) net: pktgen: fix mix of int/long tcp: Defer ts_recent changes until req is owned -Octeontx2-af: RPM: Register driver with PCI subsys IDs net: Handle napi_schedule() calls from non-interrupt -net/mlx5: Change POOL_NEXT_SIZE define value and make it global -net/mlx5: Add new health syndrome error and crr bit offset