From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 18 Sep 2025 18:23:29 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f2cdc4c22bca57ab4cdb28ef4a02c53837d26fe0;p=users%2Fhch%2Fmisc.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.17-rc7).

No conflicts.

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
  9536fbe10c9d ("net/mlx5e: Add PSP steering in local NIC RX")
  7601a0a46216 ("net/mlx5e: Add a miss level for ipsec crypto offload")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

f2cdc4c22bca57ab4cdb28ef4a02c53837d26fe0