Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-07-22--00-00 (v6.16-rc6-1724-g97ce8240b5a3) remotes/brancher/net-next-2025-07-22--03-00 (v6.16-rc6-1706-g5d746ab8a5a8) ==== BASE DIFF ==== Documentation/netlink/specs/ethtool.yaml | 41 ++- Documentation/networking/ethtool-netlink.rst | 41 +++ drivers/net/ethernet/google/gve/gve_main.c | 67 ++-- drivers/net/ethernet/intel/ice/devlink/port.c | 2 + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 + drivers/net/ethernet/intel/ice/ice_common.c | 11 +- drivers/net/ethernet/intel/ice/ice_devids.h | 18 + drivers/net/ethernet/intel/ice/ice_ethtool.c | 3 +- drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 78 ++-- drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 7 +- drivers/net/ethernet/intel/ice/ice_flow.c | 4 +- drivers/net/ethernet/intel/ice/ice_lag.c | 42 +++ drivers/net/ethernet/intel/ice/ice_lag.h | 2 + drivers/net/ethernet/intel/ice/ice_main.c | 9 + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 +- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 23 +- drivers/net/ethernet/intel/idpf/idpf.h | 52 ++- drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 334 ++++++++++++++++- drivers/net/ethernet/intel/idpf/idpf_lib.c | 23 +- drivers/net/ethernet/intel/idpf/idpf_main.c | 1 + drivers/net/ethernet/intel/idpf/idpf_ptp.c | 136 +++++++ drivers/net/ethernet/intel/idpf/idpf_ptp.h | 17 + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 13 +- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 124 ++++++- drivers/net/ethernet/intel/idpf/idpf_virtchnl.h | 6 + .../net/ethernet/intel/idpf/idpf_virtchnl_ptp.c | 55 ++- drivers/net/ethernet/intel/idpf/virtchnl2.h | 243 +++++++++++-- drivers/net/ethernet/intel/igbvf/igbvf.h | 25 -- drivers/net/ethernet/intel/igbvf/netdev.c | 7 - drivers/net/ethernet/intel/igc/igc.h | 15 +- drivers/net/ethernet/intel/igc/igc_defines.h | 4 + drivers/net/ethernet/intel/igc/igc_ethtool.c | 18 + drivers/net/ethernet/intel/igc/igc_main.c | 22 ++ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 3 - .../ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c | 1 + drivers/net/phy/qcom/qca807x.c | 4 + drivers/net/usb/cdc_ncm.c | 20 +- drivers/net/usb/smsc95xx.c | 72 +++- drivers/s390/net/qeth_core_sys.c | 22 +- include/linux/tcp.h | 1 + include/linux/usb/cdc_ncm.h | 1 + include/uapi/linux/ethtool_netlink_generated.h | 5 + net/ethtool/common.c | 39 ++ net/ethtool/common.h | 8 +- net/ethtool/ioctl.c | 48 +-- net/ethtool/netlink.c | 22 ++ net/ethtool/netlink.h | 5 + net/ethtool/rss.c | 393 +++++++++++++++++++-- net/ipv4/tcp.c | 23 +- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 1 + net/mptcp/sockopt.c | 33 +- tools/testing/selftests/drivers/net/hw/rss_api.py | 73 ++++ 53 files changed, 1912 insertions(+), 327 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.7knVVtjRgd b/tmp/tmp.OJKqoJkwcU index 53f69fa16219..44afee1800c7 100644 --- a/tmp/tmp.7knVVtjRgd +++ b/tmp/tmp.OJKqoJkwcU @@ -6,6 +6,7 @@ tc_action dbg [local patch] forwarding: set timeout to 3 hours [local patch] selftests: net: enable profiling [local patch] timestamp - try waking [local patch] +net: Restore napi threaded state only when it is enabled selftests: netfilter: tone-down conntrack clash test e1000e: ignore uninitialized checksum word on tgp e1000e: disregard NVM checksum on tgp when valid checksum bit is not set @@ -58,17 +59,6 @@ Octeontx2-af: Debugfs support for firmware data Octeontx2-af: RPM: Update DMA mask Octeontx2-af: Disable stale DMAC filters Octeontx2-af: Add programmed macaddr to RVU pfvf -ixgbe: xsk: add TX multi-buffer support -ixgbe: xsk: support batched xsk Tx interfaces to increase performance -ixgbe: xsk: use ixgbe_desc_unused as the budget in ixgbe_xmit_zc -ixgbe: xsk: resolve the underflow of budget in ixgbe_xmit_zc -ixgbe: xsk: remove budget from ixgbe_clean_xdp_tx_irq -Documentation: netlink: specs: tc: Add DualPI2 specification -selftests/tc-testing: Add selftests for qdisc DualPI2 -selftests/tc-testing: Fix warning and style check on tdc.sh -sched: Add enqueue/dequeue of dualpi2 qdisc -sched: Dump configuration and statistics of dualpi2 qdisc -sched: Struct definition and parsing of dualpi2 qdisc selftests/tc-testing: Check backlog stats in gso_skb case net/sched: Fix backlog accounting in qdisc_dequeue_internal ibmveth: Add multi buffers rx replenishment hcall support @@ -78,53 +68,11 @@ selftests: drv-net: Test XDP_TX support selftests: drv-net: Test XDP_PASS/DROP support net: netdevsim: hook in XDP handling ip6_gre: Factor out common ip6gre tunnel match into helper -mptcp: fix typo in a comment -mptcp: add TCP_MAXSEG sockopt support -tcp: add tcp_sock_set_maxseg -mptcp: sockopt: drop redundant tcp_getsockopt -ixgbevf: remove unused fields from struct ixgbevf_adapter -igbvf: remove unused fields from struct igbvf_adapter -igc: Add wildcard rule support to ethtool NFC using Default Queue -igc: Relocate RSS field definitions to igc_defines.h -ice: breakout common LAG code into helpers -ice: convert ice_add_prof() to bitmap -ice: add E835 device IDs -ice: add 40G speed to Admin Command GET PORT OPTION -idpf: preserve coalescing settings across resets -idpf: add cross timestamping -idpf: add flow steering support -virtchnl2: add flow steering support -virtchnl2: rename enum virtchnl2_cap_rss -s390/qeth: Make hw_trap sysfs attribute idempotent -net: phy: qcom: qca807x: Enable WoL support using shared library -net: usb: smsc95xx: add support for ethtool pause parameters -selftests: drv-net: rss_api: context create and delete tests -ethtool: rss: support removing contexts via Netlink -ethtool: rss: support creating contexts via Netlink -ethtool: move ethtool_rxfh_ctx_alloc() to common code -ethtool: rss: factor out populating response from context -ethtool: rss: factor out allocating memory for response -ethtool: rejig the RSS notification machinery for more types -ethtool: assert that drivers with sym hash are consistent for RSS contexts net/sched: sch_qfq: Avoid triggering might_sleep in atomic context in qfq_delete_class -gve: Fix stuck TX queue for DQ queue format -octeontx2-pf: Use new bandwidth profiles in receive queue -octeontx2-af: Display new bandwidth profiles too in debugfs -octeontx2-af: Accommodate more bandwidth profiles for cn20k -octeontx2-pf: Initialize new NIX SQ context for cn20k -octeontx2-pf: Initialize cn20k specific aura and pool contexts -octeontx2-af: Skip NDC operations for cn20k -octeontx2-af: Extend debugfs support for cn20k NPA -octeontx2-af: Add cn20k NPA block contexts -octeontx2-af: Extend debugfs support for cn20k NIX -octeontx2-af: Add cn20k NIX block contexts -octeontx2-af: Simplify context writing and reading to hardware gve: implement DQO RX datapath and control path for AF_XDP zero-copy gve: implement DQO TX datapath for AF_XDP zero-copy gve: keep registry of zc xsk pools in netdev_priv gve: merge xdp and xsk registration gve: deduplicate xdp info and xsk pool registration logic -net: usb: cdc-ncm: check for filtering capability ptp: add Alibaba CIPU PTP clock driver -net: stmmac: dwmac-renesas-gbeth: Add PM suspend/resume callbacks net: pppoe: implement GRO support