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

Browse source

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

No conflicts.

Adjacent changes:

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

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

...

This commit is contained in:

Jakub Kicinski 2025-09-18 11:23:29 -07:00

parent 1d9770838d cbf658dd09

commit f2cdc4c22b

229 changed files with 2558 additions and 1343 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

include/net/dst_metadata.h

View file

5

include/net/sock.h

View file