Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-09-18--09-00 (v6.17-rc5-1379-g381ce318a889) remotes/brancher/net-next-2025-09-18--12-00 (v6.17-rc5-1410-gf882fa03b0fa) ==== BASE DIFF ==== Documentation/netlink/specs/psp.yaml | 187 ++++ .../device_drivers/ethernet/meta/fbnic.rst | 19 + Documentation/networking/index.rst | 1 + Documentation/networking/psp.rst | 183 ++++ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 57 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_coredump.h | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 13 - drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 45 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 21 +- drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 11 + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en/params.c | 4 +- .../mellanox/mlx5/core/en_accel/en_accel.h | 50 +- .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 2 +- .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 952 +++++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/en_accel/psp.h | 61 ++ .../mellanox/mlx5/core/en_accel/psp_rxtx.c | 200 +++++ .../mellanox/mlx5/core/en_accel/psp_rxtx.h | 121 +++ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 9 + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 49 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 10 +- .../net/ethernet/mellanox/mlx5/core/lib/crypto.h | 1 + drivers/net/ethernet/meta/fbnic/fbnic.h | 13 + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 18 + drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 249 ++++++ drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 241 +++++- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 47 + drivers/net/ethernet/meta/fbnic/fbnic_fw_log.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_fw_log.h | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 39 +- drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 57 +- include/linux/bnxt/hsi.h | 61 ++ include/linux/netdevice.h | 4 + include/linux/skbuff.h | 3 + include/net/dropreason-core.h | 6 + include/net/inet_timewait_sock.h | 8 + include/net/psp.h | 12 + include/net/psp/functions.h | 210 +++++ include/net/psp/types.h | 184 ++++ include/net/sock.h | 26 +- include/uapi/linux/psp.h | 66 ++ net/Kconfig | 1 + net/Makefile | 1 + net/core/dev.c | 32 + net/core/gro.c | 2 + net/core/skbuff.c | 4 + net/ipv4/af_inet.c | 2 + net/ipv4/inet_timewait_sock.c | 5 + net/ipv4/ip_output.c | 5 +- net/ipv4/tcp.c | 2 + net/ipv4/tcp_ipv4.c | 18 +- net/ipv4/tcp_minisocks.c | 20 + net/ipv4/tcp_output.c | 17 +- net/ipv6/ipv6_sockglue.c | 6 +- net/ipv6/tcp_ipv6.c | 17 +- net/psp/Kconfig | 15 + net/psp/Makefile | 5 + net/psp/psp-nl-gen.c | 119 +++ net/psp/psp-nl-gen.h | 39 + net/psp/psp.h | 54 ++ net/psp/psp_main.c | 321 +++++++ net/psp/psp_nl.c | 505 +++++++++++ net/psp/psp_sock.c | 295 +++++++ net/tls/tls.h | 1 + net/tls/tls_strp.c | 14 +- net/tls/tls_sw.c | 3 +- tools/net/ynl/Makefile.deps | 1 + tools/testing/selftests/net/tls.c | 16 + 73 files changed, 4667 insertions(+), 124 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.fGIBJ5wIs8 b/tmp/tmp.fuHD4UGbtZ index ab4ae2966603..5756fb96b21f 100644 --- a/tmp/tmp.fGIBJ5wIs8 +++ b/tmp/tmp.fuHD4UGbtZ @@ -12,6 +12,22 @@ nipa: profile (time) test output nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests +net/mlx5: Use %pe format specifier for error pointers +scripts/coccinelle: Find PTR_ERR() to %pe candidates +devlink rate: Remove unnecessary 'static' from a couple places +net: ti: icssm-prueth: unwind cleanly in probe() +hinic3: Fix NULL vs IS_ERR() check in hinic3_alloc_rxqs_res() +ethernet: eswin: Add eic7700 ethernet driver +dt-bindings: ethernet: eswin: Document for EIC7700 SoC +mptcp: reset blackhole on success with non-loopback ifaces +page_pool: add debug for release to cache from wrong CPU +net: dsa: microchip: Set SPI as bus interface during reset for KSZ8463 +dt-bindings: net: dsa: microchip: Add strap description to set SPI mode +dt-bindings: net: dsa: microchip: Group if clause under allOf tag +net: ipv4: convert ip_rcv_options to drop reasons +net: ipv4: use the right type for drop reasons in ip_rcv_finish_core +net: ipv4: simplify drop reason handling in ip_rcv_finish_core +net: ipv4: make udp_v4_early_demux explicitly return drop reason net/mlx5e: Add flow rules for the decrypted ESP packets net/mlx5e: Add flow groups for the packets decrypted by crypto offload net/mlx5e: Recirculate decrypted packets into TTC table @@ -58,34 +74,6 @@ net: wan: framer: Add version sysfs attribute for the Lantiq PEF2256 framer octeontx2-pf: Fix use-after-free bugs in otx2_sync_tstamp() cnic: Fix use-after-free bugs in cnic_delete_task net: ti: am65-cpsw: Update hw timestamping filter for PTPv1 RX packets -bnxt_en: Implement ethtool .set_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Implement ethtool .get_tunable() for ETHTOOL_PFC_PREVENTION_TOUT -bnxt_en: Use VLAN_ETH_HLEN when possible -bnxt_en: Support for RoCE resources dynamically shared within VFs. -bnxt_en: Add err_qpc backing store handling -bnxt_en: Add fw log trace support for 5731X/5741X chips -bnxt_en: Improve bnxt_backing_store_cfg_v2() -bnxt_en: Optimize bnxt_sriov_disable() -bnxt_en: Remove unnecessary VF check in bnxt_hwrm_nvm_req() -bnxt_en: Drop redundant if block in bnxt_dl_flash_update() -selftests: tls: test skb copy under mem pressure and OOB -tls: make sure to abort the stream if headers are bogus -eth: fbnic: add OTP health reporter -eth: fbnic: report FW uptime in health diagnose -eth: fbnic: add FW health reporter -eth: fbnic: support FW communication for core dump -eth: fbnic: support allocating FW completions with extra space -eth: fbnic: reprogram TCAMs after FW crash -eth: fbnic: factor out clearing the action TCAM -eth: fbnic: use fw uptime to detect fw crashes -eth: fbnic: make fbnic_fw_log_write() parameter const -net: sfp: remove old sfp_parse_* functions -net: phy: update all PHYs to use sfp_get_module_caps() -net: phylink: use sfp_get_module_caps() -net: sfp: provide sfp_get_module_caps() -net: sfp: convert sfp quirks to modify struct sfp_module_support -net: sfp: pre-parse the module support -net: phy: add phy_interface_copy() net/mlx5e: Prevent WQE metadata conflicts between timestamping and offloads net/mlx5: Refactor MACsec WQE metadata shifts net/mlx5: Remove VLAN insertion fields from WQE Ether segment