Commit 5ef04a7b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



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

No conflicts.

Adjacent changes:

include/net/sock.h
  c51613fa ("net: add sk->sk_drop_counters")
  5d6b58c9 ("net: lockless sock_i_ino()")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c975e1df d69eb204
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment