Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-08--03-00 (v6.18-rc4-897-g331f7bb1ce2c) remotes/brancher/net-next-2025-11-08--06-00 (v6.18-rc4-902-g7ae23b3efe49) ==== BASE DIFF ==== Documentation/admin-guide/sysctl/net.rst | 4 +- .../networking/devlink/devlink-params.rst | 4 + Documentation/networking/devlink/i40e.rst | 34 + 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/stmicro/stmmac/dwmac-lpc18xx.c | 42 +- drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 50 +- drivers/net/phy/micrel.c | 12 +- include/linux/avf/virtchnl.h | 50 + include/net/devlink.h | 4 + net/core/dev.c | 1 + net/core/hotdata.c | 2 +- net/core/skbuff.c | 12 +- net/devlink/param.c | 5 + 25 files changed, 2184 insertions(+), 200 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.dvgcR3liiu b/tmp/tmp.MXZz9JQKeu index b3c210e485f8..e8faf9dbc2b4 100644 --- a/tmp/tmp.dvgcR3liiu +++ b/tmp/tmp.MXZz9JQKeu @@ -12,6 +12,7 @@ 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 +net: netcp: ethss: Fix type of first parameter in hwtstamp stubs net/mlx5: implement swp_l4_csum_mode via devlink params devlink: pass extack through to devlink_param::get() net: phy: mscc: Add support for PHY LED control @@ -66,20 +67,9 @@ 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 -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(). 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 @@ -91,15 +81,6 @@ 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() -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 @@ -118,7 +99,6 @@ 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(). wireguard: netlink: generate netlink code wireguard: netlink: rename netlink handlers