Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-11-08--00-00 (v6.18-rc4-912-gd3db51b22ff8) remotes/brancher/net-next-hw-2025-11-08--08-00 (v6.18-rc4-888-g7f518d7ba4b7) ==== BASE DIFF ==== Documentation/admin-guide/sysctl/net.rst | 4 +- Documentation/netlink/specs/psp.yaml | 95 ++ .../networking/devlink/devlink-params.rst | 4 + Documentation/networking/devlink/i40e.rst | 34 + Documentation/networking/ip-sysctl.rst | 13 +- drivers/net/ethernet/airoha/airoha_eth.c | 85 +- drivers/net/ethernet/airoha/airoha_eth.h | 7 +- drivers/net/ethernet/freescale/fec_main.c | 2 + drivers/net/ethernet/intel/i40e/i40e.h | 4 + drivers/net/ethernet/intel/i40e/i40e_devlink.c | 54 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 31 +- drivers/net/ethernet/intel/iavf/iavf_adv_rss.c | 119 +- drivers/net/ethernet/intel/iavf/iavf_adv_rss.h | 31 + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 89 ++ drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 91 +- drivers/net/ethernet/intel/ice/ice_flex_type.h | 1 + drivers/net/ethernet/intel/ice/ice_flow.c | 269 +++- drivers/net/ethernet/intel/ice/ice_flow.h | 94 +- drivers/net/ethernet/intel/ice/ice_protocol_type.h | 20 + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 48 + drivers/net/ethernet/intel/ice/virt/rss.c | 1313 +++++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 233 +++- .../net/ethernet/mellanox/mlx5/core/en_accel/psp.h | 16 + .../mellanox/mlx5/core/en_accel/psp_rxtx.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 + drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 42 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 50 +- drivers/net/netdevsim/netdevsim.h | 5 + drivers/net/netdevsim/psp.c | 27 + drivers/net/phy/fixed_phy.c | 2 +- drivers/net/phy/mdio-open-alliance.h | 36 + drivers/net/phy/micrel.c | 12 +- drivers/net/phy/microchip_t1s.c | 2 + drivers/net/phy/phy-c45.c | 122 ++ include/linux/avf/virtchnl.h | 50 + include/linux/phy.h | 3 + include/linux/phy_fixed.h | 6 +- include/net/devlink.h | 4 + include/net/inet_connection_sock.h | 11 +- include/net/netns/ipv4.h | 1 + include/net/psp/types.h | 32 + include/net/request_sock.h | 1 - include/net/tcp.h | 8 + include/uapi/linux/psp.h | 18 + net/core/dev.c | 1 + net/core/hotdata.c | 2 +- net/core/skbuff.c | 12 +- net/devlink/param.c | 5 + net/ipv4/inet_connection_sock.c | 19 +- net/ipv4/sysctl_net_ipv4.c | 9 + net/ipv4/tcp_input.c | 40 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_minisocks.c | 5 +- net/ipv4/tcp_timer.c | 3 +- net/ipv6/tcp_ipv6.c | 1 - net/psp/psp-nl-gen.c | 19 + net/psp/psp-nl-gen.h | 2 + net/psp/psp_main.c | 3 +- net/psp/psp_nl.c | 93 ++ net/psp/psp_sock.c | 4 +- net/strparser/strparser.c | 2 +- tools/testing/selftests/drivers/net/psp.py | 13 + .../selftests/net/forwarding/local_termination.sh | 2 + .../net/packetdrill/tcp_rto_synack_rto_max.pkt | 54 + 65 files changed, 3072 insertions(+), 316 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.5x8n3u6gP6 b/tmp/tmp.SInMJ0ZbcM index 7ea0489cb8cd..adf4d221e4f8 100644 --- a/tmp/tmp.5x8n3u6gP6 +++ b/tmp/tmp.SInMJ0ZbcM @@ -13,23 +13,12 @@ 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 -iavf: clarify VLAN add/delete log messages and lower log level net: sparx5/lan969x: populate netdev of_node isdn: kcapi: add WQ_PERCPU to alloc_workqueue users -ice: fix comment typo and correct module format string net: stmmac: dwmac-sophgo: Add phy interface filter net: phy: Add helper for fixing RGMII PHY mode based on internal mac delay dt-bindings: net: sophgo,sg2044-dwmac: add phy mode restriction tg3: Fix num of RX queues being reported by ethtool -net: stmmac: qcom-ethqos: add support for sa8255p -net: stmmac: qcom-ethqos: define a callback for setting the serdes speed -net: stmmac: qcom-ethqos: split power management context into a separate struct -net: stmmac: qcom-ethqos: split power management fields into a separate structure -net: stmmac: qcom-ethqos: wrap emac driver data in additional structure -net: stmmac: qcom-ethqos: improve typing in devres callback -net: stmmac: qcom-ethqos: use generic device properties -dt-bindings: net: qcom: document the ethqos device for SCMI-based systems -net: dsa: b53: bcm531x5: fix cpu rgmii mode interpretation net: stmmac: ingenic: use ->set_phy_intf_sel() net: stmmac: ingenic: pass ingenic_mac struct rather than plat_dat net: stmmac: ingenic: simplify x2000 mac_set_mode() @@ -51,11 +40,6 @@ net: dsa: b53: move reading ARL entries into their own function net: dsa: b53: b53_arl_read{,25}(): use the entry for comparision ptp: ocp: Document sysfs output format for backward compatibility tipc: Fix use-after-free in tipc_mon_reinit_self(). -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 virtio_net: Add get ethtool flow rules ops virtio_net: Add support for TCP and UDP ethtool rules virtio_net: Add support for IPv6 ethtool steering @@ -69,59 +53,20 @@ virtio: Expose generic device capability operations virtio: Add config_op for admin commands virtio_pci: Remove supported_cap size build assert net/smc: fix mismatch between CLC header and proposal -selftests/vsock: disable shellcheck SC2317 and SC2119 -selftests/vsock: add vsock_loopback module loading -selftests/vsock: add 1.37 to tested virtme-ng versions -selftests/vsock: add BUILD=0 definition -selftests/vsock: add check_result() for pass/fail counting -selftests/vsock: speed up tests by reducing the QEMU pidfile timeout -selftests/vsock: do not unconditionally die if qemu fails -selftests/vsock: avoid multi-VM pidfile collisions with QEMU -selftests/vsock: reuse logic for vsock_test through wrapper functions -selftests/vsock: make wait_for_listener() work even if pipefail is on -selftests/vsock: improve logging in vmtest.sh -iavf: add RSS support for GTP protocol via ethtool -ice: Extend PTYPE bitmap coverage for GTP encapsulated flows -ice: improve TCAM priority handling for RSS profiles -ice: implement GTP RSS context tracking and configuration -ice: add virtchnl definitions and static data for GTP RSS -ice: add flow parsing for GTP and new protocol field support -i40e: support generic devlink param "max_mac_per_vf" -devlink: Add new "max_mac_per_vf" generic device param sctp: Don't inherit do_auto_asconf in sctp_clone_sock(). -strparser: Fix signed/unsigned mismatch bug -qede: convert to use ndo_hwtstamp callbacks -bnx2x: convert to use ndo_hwtstamp callbacks selftests/tc-testing: Create tests trying to add children to clsact/ingress qdiscs net/sched: Abort __tc_modify_qdisc if parent is a clsact/ingress qdisc -net: increase skb_defer_max default to 128 -net: fix napi_consume_skb() with alien skbs -net: allow skb_release_head_state() to be called multiple times gve: Default to max_rx_buffer_size for DQO if device supported gve: Allow ethtool to configure rx_buf_len gve: Use extack to log xdp config verification errors gve: Decouple header split from RX buffer length bonding: fix mii_status when slave is down usbnet: Add support for Byte Queue Limits (BQL) -selftests: net: local_termination: Wait for interfaces to come up -tun: use skb_attempt_defer_free in tun_do_read -i40e: validate ring_len parameter against hardware specific values. net/handshake: Fix memory leak in tls_handshake_accept() -net: airoha: Add the capability to consume out-of-order DMA tx descriptors net: dsa: microchip: Immediately assing IRQ numbers net: dsa: microchip: Ensure a ksz_irq is initialized before freeing it net: dsa: microchip: ptp: Fix checks on irq_find_mapping() net: dsa: microchip: common: Fix checks on irq_find_mapping() -tcp: add net.ipv4.tcp_comp_sack_rtt_percent -net: stmmac: sti: use ->set_phy_intf_sel() -net: stmmac: sti: use stmmac_get_phy_intf_sel() -net: stmmac: sti: use PHY_INTF_SEL_x directly -net: stmmac: sti: use PHY_INTF_SEL_x to select PHY interface -net: stmmac: lpc18xx: use ->set_phy_intf_sel() -net: stmmac: lpc18xx: validate phy_intf_sel -net: stmmac: lpc18xx: use stmmac_get_phy_intf_sel() -net: stmmac: lpc18xx: use PHY_INTF_SEL_x directly -net: stmmac: lpc18xx: convert to PHY_INTF_SEL_x sctp: prevent possible shift-out-of-bounds in sctp_transport_update_rto Documentation: networking: Document the phy_port infrastructure net: phy: dp83822: Add SFP support through the phy_port interface @@ -140,22 +85,7 @@ net: ethtool: Introduce ETHTOOL_LINK_MEDIUM_* values dt-bindings: net: Introduce the ethernet-connector description net: ethernet: ti: am65-cpsw-qos: fix IET verify retry mechanism net: ethernet: ti: am65-cpsw-qos: fix IET verify/response timeout -net: add prefetch() in skb_defer_free_flush() net: sched: sch_qfq: Fix use-after-free in qfq_reset_qdisc(). -net: fec: correct rx_bytes statistic for the case SHIFT16 is set -selftest: packetdrill: Add max RTO test for SYN+ACK. -tcp: Apply max RTO to non-TFO SYN+ACK. -tcp: Remove timeout arg from reqsk_timeout(). -tcp: Remove redundant init for req->num_timeout. -tcp: Remove timeout arg from reqsk_queue_hash_req(). -tcp: Call tcp_syn_ack_timeout() directly. -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: phy: fixed_phy: shrink size of struct fixed_phy_status -net: mana: Fix incorrect speed reported by debugfs wireguard: netlink: generate netlink code wireguard: netlink: rename netlink handlers wireguard: netlink: convert to split ops @@ -168,8 +98,6 @@ wireguard: netlink: enable strict genetlink validation wireguard: netlink: use WG_KEY_LEN in policies wireguard: netlink: validate nested arrays in policy net/ipv6: fix lookup for ::/0 (non-)subtree route -net: phy: microchip_t1s:: add cable diagnostic support for LAN867x Rev.D0 -net: phy: phy-c45: add OATC14 10BASE-T1S PHY cable diagnostic support net: enetc: add port MDIO support for ENETC v4 net: enetc: set external MDIO PHY address for i.MX94 ENETC net: enetc: set external MDIO PHY address for i.MX95 ENETC