Single branch specified, using that and the previous one: remotes/brancher/net-next-hw-2025-08-26--00-00 (v6.17-rc2-638-gbff24ccfce0d) remotes/brancher/net-next-hw-2025-08-26--08-00 (v6.17-rc2-655-g52d0b1ce985a) ==== BASE DIFF ==== drivers/isdn/hardware/mISDN/hfcpci.c | 12 +- drivers/net/ethernet/airoha/airoha_eth.c | 7 +- drivers/net/ethernet/airoha/airoha_eth.h | 12 +- drivers/net/ethernet/airoha/airoha_npu.c | 1 - drivers/net/ethernet/airoha/airoha_ppe.c | 112 +++-- drivers/net/ethernet/dlink/dl2k.c | 2 +- drivers/net/ethernet/ibm/ibmvnic.c | 59 ++- drivers/net/ethernet/ibm/ibmvnic.h | 6 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 7 + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 4 - drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 14 + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 9 +- drivers/net/ethernet/netronome/nfp/crypto/tls.c | 9 +- drivers/net/phy/mxl-86110.c | 392 ++++++++++++++++- include/linux/inet_diag.h | 13 - include/linux/phylink.h | 7 +- include/linux/soc/airoha/airoha_offload.h | 55 +++ include/net/inet6_hashtables.h | 18 +- include/net/inet_hashtables.h | 37 +- include/net/timewait_sock.h | 7 - net/core/filter.c | 5 +- net/ipv4/esp4.c | 4 +- net/ipv4/inet_diag.c | 479 --------------------- net/ipv4/inet_hashtables.c | 34 +- net/ipv4/inet_timewait_sock.c | 5 +- net/ipv4/netfilter/nf_socket_ipv4.c | 3 +- net/ipv4/netfilter/nf_tproxy_ipv4.c | 5 +- net/ipv4/tcp_diag.c | 463 +++++++++++++++++++- net/ipv4/tcp_ipv4.c | 17 +- net/ipv4/tcp_minisocks.c | 1 - net/ipv4/tcp_offload.c | 3 +- net/ipv6/esp6.c | 4 +- net/ipv6/inet6_hashtables.c | 51 ++- net/ipv6/netfilter/nf_socket_ipv6.c | 3 +- net/ipv6/netfilter/nf_tproxy_ipv6.c | 5 +- net/ipv6/tcp_ipv6.c | 15 +- net/ipv6/tcpv6_offload.c | 3 +- 37 files changed, 1162 insertions(+), 721 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.0xQfKoN2vw b/tmp/tmp.1lvJ5ctCqd index b4c028a6479c..260def2353d4 100644 --- a/tmp/tmp.0xQfKoN2vw +++ b/tmp/tmp.1lvJ5ctCqd @@ -13,6 +13,23 @@ nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: dbg net/sctp_vrf.sh nipa: disable random kunit tests +fbnic: Move phylink resume out of service_task and into open/close +fbnic: Fixup rtnl_lock and devl_lock handling related to mailbox code +ixgbe: fix ixgbe_orom_civd_info struct layout +ice: fix incorrect counter for buffer allocation failures +ice: use fixed adapter index for E825C embedded devices +ice: don't leave device non-functional if Tx scheduler config fails +ice: fix NULL pointer dereference in ice_unplug_aux_dev() on reset +TUN/TAP: Improving throughput and latency by avoiding SKB drops +eth: fbnic: Add pause stats support +eth: fbnic: Read PHY stats via the ethtool API +eth: fbnic: Fetch PHY stats from device +eth: fbnic: Reset MAC stats +eth: fbnic: Reset hw stats upon PCI error +eth: fbnic: Move hw_stats_lock out of fbnic_dev +net: add new sk->sk_drops1 field +net: move sk_drops out of sock_write_rx group +net: add sk_drops_read(), sk_drops_inc() and sk_drops_reset() helpers selftests: drv-net: ncdevmem: explicitly set HDS threshold to 0 selftests: drv-net: ncdevmem: restore original HDS setting before exiting selftests: drv-net: ncdevmem: restore old channel config @@ -42,7 +59,6 @@ docs: networking: clarify expectation of persistent stats ipv4: Convert ->flowi4_tos to dscp_t. net: hv_netvsc: fix loss of early receive events from host during channel open. ptp: Limit time setting of PTP clocks -net: mana: Remove redundant netdev_lock_ops_to_full() calls net: stmmac: imx: add i.MX91 support arm64: dts: imx93-11x11-evk: remove fec property eee-broken-1000t arm64: dts: freescale: add i.MX91 11x11 EVK basic support @@ -80,35 +96,18 @@ devlink: Move health reporter recovery abort logic to a separate function devlink: Move graceful period parameter to reporter ops ipv6: sr: Prepare HMAC key ahead of time ipv6: sr: Use HMAC-SHA1 and HMAC-SHA256 library functions -net: phylink: remove stale an_enabled from doc net: phy: fixed_phy: let fixed_phy_unregister free the phy_device -net: dlink: fix multicast stats being counted incorrectly net: phy: as21xxx: better handle PHY HW reset on soft-reboot net: phy: introduce phy_id_compare_vendor() PHY ID helper net: rose: include node references in rose_neigh refcount net: rose: convert 'use' field to refcount_t net: rose: split remove and free operations in rose_remove_neigh() -net: airoha: Introduce check_skb callback in ppe_dev ops -net: airoha: Add airoha_ppe_dev struct definition -net: airoha: Rely on airoha_eth struct in airoha_ppe_flow_offload_cmd signature net: phy: fixed: let fixed_phy_add always use addr 0 and remove return value -tcp: Move TCP-specific diag functions to tcp_diag.c. -tcp: Don't pass hashinfo to inet_diag helpers. -tcp: Don't pass hashinfo to socket lookup helpers. -tcp: Remove hashinfo test for inet6?_lookup_run_sk_lookup(). -tcp: Remove timewait_sock_ops.twsk_destructor(). -tcp: Remove sk_protocol test for tcp_twsk_unique(). -mISDN: hfcpci: Fix warning when deleting uninitialized timer -net: phy: mxl-86110: add basic support for MxL86111 PHY -net: phy: mxl-86110: fix indentation in struct phy_driver -net: phy: mxl-86110: add basic support for led_brightness_set op net: ti: icssm-prueth: Adds IEP support for PRUETH on AM33x, AM43x and AM57x SOCs net: ti: icssm-prueth: Adds link detection, RX and TX support. net: ti: icssm-prueth: Adds PRUETH HW and SW configuration net: ti: icssm-prueth: Adds ICSSM Ethernet driver dt-bindings: net: ti: Adds DUAL-EMAC mode support on PRU-ICSS2 for AM57xx, AM43xx and AM33xx SOCs -Octeontx2-af: Fix NIX X2P calibration failures -amd-xgbe: Add PPS periodic output support net: usb: qmi_wwan: add Telit Cinterion LE910C4-WWX new compositions microchip: lan865x: add ndo_eth_ioctl handler to enable PHY ioctl support net/mlx5: {DR,HWS}, Use the cached vhca_id for this device @@ -118,6 +117,4 @@ net/mlx5: E-Switch, Create acls root namespace for adjacent vports net/mlx5: E-Switch, Add support for adjacent functions vports discovery net/mlx5: E-Switch, Move vport acls root namespaces creation to eswitch net/mlx5: FS, Convert vport acls root namespaces to xarray -ibmvnic: Increase max subcrq indirect entries with fallback -octeontx2-af: Remove unused declarations i40e: Prevent unwanted interface name changes