torvalds-linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-12 01:20:14 +00:00

History

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

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

Conflicts:

net/netfilter/nft_set_pipapo.c
net/netfilter/nft_set_pipapo_avx2.c
  c4eaca2e1052 ("netfilter: nft_set_pipapo: don't check genbit from packetpath lookups")
  84c1da7b38d9 ("netfilter: nft_set_pipapo: use avx2 algorithm for insertions too")

Only trivial adjacent changes (in a doc and a Makefile).

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

2025-09-11 17:40:13 -07:00

af_netlink.c

net: add sk_drops_read(), sk_drops_inc() and sk_drops_reset() helpers

2025-08-28 13:14:50 +02:00

af_netlink.h

netlink: terminate outstanding dump on socket close

2024-11-07 13:45:34 -08:00

diag.c

net: lockless sock_i_ino()

2025-09-03 16:08:24 -07:00

genetlink.c

genetlink: fix genl_bind() invoking bind() after -EPERM