Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-09-17--00-00 (v6.17-rc5-1273-g295c218eb76a) remotes/brancher/net-next-hw-2025-09-17--08-00 (v6.17-rc5-1338-gbb558b22655b) ==== BASE DIFF ==== Documentation/networking/devlink/index.rst | 20 +- MAINTAINERS | 2 +- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 - drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 1 + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 1 + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 27 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 +- drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 1 + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 45 +- drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 1 + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 14 +- .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 44 +- .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 16 +- drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 15 +- drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c | 6 +- drivers/net/ethernet/mellanox/mlx5/core/main.c | 24 - include/linux/mlx5/driver.h | 1 + net/batman-adv/Kconfig | 13 - net/batman-adv/Makefile | 1 - net/batman-adv/bat_iv_ogm.c | 5 - net/batman-adv/bridge_loop_avoidance.c | 34 + net/batman-adv/hard-interface.c | 1 + net/batman-adv/hard-interface.h | 1 - net/batman-adv/log.h | 3 - net/batman-adv/main.c | 50 - net/batman-adv/main.h | 5 +- net/batman-adv/mesh-interface.c | 15 +- net/batman-adv/mesh-interface.h | 1 - net/batman-adv/netlink.c | 17 - net/batman-adv/netlink.h | 1 - net/batman-adv/network-coding.c | 1878 -------------------- net/batman-adv/network-coding.h | 106 -- net/batman-adv/originator.c | 6 - net/batman-adv/routing.c | 9 +- net/batman-adv/send.c | 16 +- net/batman-adv/translation-table.c | 4 +- net/batman-adv/types.h | 216 --- 42 files changed, 222 insertions(+), 2418 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.ZO8GoR6EWF b/tmp/tmp.tGju4d6UY5 index c8247cf60523..0e985c5d6a26 100644 --- a/tmp/tmp.ZO8GoR6EWF +++ b/tmp/tmp.tGju4d6UY5 @@ -13,6 +13,73 @@ 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 +cnic: Fix use-after-free bugs in cnic_delete_task +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 +mptcp: Use __sk_dst_get() and dst_dev_rcu() in mptcp_active_enable(). +mptcp: Call dst_release() in mptcp_active_enable(). +tls: Use __sk_dst_get() and dst_dev_rcu() in get_netdev_for_sock(). +smc: Use __sk_dst_get() and dst_dev_rcu() in smc_vlan_by_tcpsk(). +smc: Use __sk_dst_get() and dst_dev_rcu() in smc_clc_prfx_match(). +smc: Use __sk_dst_get() and dst_dev_rcu() in in smc_clc_prfx_set(). +smc: Fix use-after-free in __pnet_find_base_ndev(). +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() +ptp: rework ptp_clock_unregister() to disable events +ptp: describe the two disables in ptp_set_pinfunc() +igc: don't fail igc_probe() on LED setup error +ixgbe: destroy aci.lock later within ixgbe_remove path +ixgbe: initialize aci.lock before it's used +i40e: remove redundant memory barrier when cleaning Tx descs +ice: fix Rx page leak on multi-buffer frames +net: dsa: mv88e6xxx: move mv88e6xxx_hwtstamp_work() prototype +net: dsa: mv88e6xxx: remove unused 88E6165 register definitions +net: dsa: mv88e6xxx: remove duplicated register definition +net: dsa: mv88e6xxx: remove unused TAI definitions +net: dsa: mv88e6xxx: rename TAI definitions according to core +net/mlx5e: Report RS-FEC histogram statistics via ethtool +net/mlx5e: Add logic to read RS-FEC histogram bin ranges from PPHCR +net/mlx5e: Don't query FEC statistics when FEC is disabled +ethtool: add FEC bins histogram report +net: dlink: handle copy_thresh allocation failure +net: dlink: fix whitespace around function call +tools: ynl-gen: support uint in multi-attr +net: renesas: rswitch: simplify rswitch_stop() +net: pcs: Kconfig: Fix unmet dependency warning +udp: use skb_attempt_defer_free() +udp: make busylock per socket +udp: add udp_drops_inc() helper +net: group sk_backlog and sk_receive_queue +udp: update sk_rmem_alloc before busylock acquisition +udp: refine __udp_enqueue_schedule_skb() test +ipv6: reorganise struct ipv6_pinfo +ipv6: np->rxpmtu race annotation +ipv6: make ipv6_pinfo.daddr_cache a boolean +ipv6: make ipv6_pinfo.saddr_cache a boolean eth: fbnic: support devmem Tx selftests/net: test ipip packets in gro.sh net: gro: remove unnecessary df checks @@ -33,10 +100,6 @@ octeon_ep: fix VF MAC address lifecycle handling net: stmmac: correct Tx descriptors debugfs prints net: stmmac: add TC flower filter support for IP EtherType net: stmmac: enhance VLAN protocol detection for GRO -batman-adv: remove includes for extern declarations -batman-adv: keep skb crc32 helper local in BLA -batman-adv: remove network coding support -batman-adv: Start new development cycle net: stmmac: check if interface is running before TC block setup net: stmmac: replace memcpy with ethtool_puts in ethtool net: phy: micrel: Add Fast link failure support for lan8842 @@ -54,21 +117,8 @@ net: cadence: macb: Add support for Raspberry Pi RP1 ethernet controller selftests: bonding: add vlan over bond testing bonding: don't set oif to bond dev when getting NS target destination Revert "net: ethernet: stmmac: dwmac-rk: Make the clk_phy could be used for external phy" -MAINTAINERS: make the DPLL entry cover drivers selftest: packetdrill: Add tcp_fastopen_server_reset-after-disconnect.pkt. tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect(). -net: pse-pd: pd692x0: Add devlink interface for configuration save/reset -devlink: Add devlink-conf uAPI for NV memory management -docs: devlink: Sort table of contents alphabetically -net: pse-pd: pd692x0: Separate configuration parsing from hardware setup -net: pse-pd: pd692x0: Replace __free macro with explicit kfree calls -net/mlx5: Lag, add net namespace support -net/mlx5: Add net namespace support to devcom -net/mlx5: Lag, move devcom registration to LAG layer -net/mlx5: Refactor devcom to use match attributes -net/mlx5e: Add a miss level for ipsec crypto offload -net/mlx5e: Prevent entering switchdev mode with inconsistent netns -net/mlx5e: Harden uplink netdev access against device unbind ptp: netc: only enable periodic pulse event interrupts for PPS net: stmmac: est: Drop frames causing HLBS error net: stmmac: Consider Tx VLAN offload tag length for maxSDU