]> Gentwo Git Trees - linux/.git/commit
gentwo / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f79020 db87bd2)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 12 Sep 2025 00:37:09 +0000 (17:37 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 12 Sep 2025 00:40:13 +0000 (17:40 -0700)
commitfc3a2810412c163b5df1b377d332e048860f45db
tree9eeb81c7f965176a32ca3062aefcc3532c637b01tree | snapshot
parent5f790208d68fe1526c751dc2af366c7b552b8631commit | diff
parentdb87bd2ad1f736c2f7ab231f9b40c885934f6b2ccommit | diff
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>
16 files changed:
Documentation/networking/mptcp.rst diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/igb/igb_main.c diff1 | diff2 | blob | history
drivers/net/macsec.c diff1 | diff2 | blob | history
drivers/net/phy/Kconfig diff1 | diff2 | blob | history
include/net/netfilter/nf_tables.h diff1 | diff2 | blob | history
include/net/netfilter/nf_tables_core.h diff1 | diff2 | blob | history
kernel/bpf/helpers.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
net/netfilter/nf_tables_api.c diff1 | diff2 | blob | history
net/netfilter/nft_set_pipapo.c diff1 | diff2 | blob | history
net/netfilter/nft_set_pipapo_avx2.c diff1 | diff2 | blob | history
net/netfilter/nft_set_rbtree.c diff1 | diff2 | blob | history
tools/testing/selftests/net/Makefile diff1 | diff2 | blob | history
tools/testing/selftests/net/mptcp/mptcp_join.sh diff1 | diff2 | blob | history
Development tree.