Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-26--12-00 (net-next-6.12-171-g116a5a276b3f) remotes/brancher/net-next-2024-09-26--15-00 (net-next-6.12-188-g486ada25f911) ==== BASE DIFF ==== Documentation/networking/tproxy.rst | 2 +- include/linux/netfilter.h | 4 - net/ipv4/netfilter/nf_reject_ipv4.c | 10 +- net/ipv6/netfilter/nf_reject_ipv6.c | 5 +- net/netfilter/nf_conntrack_core.c | 141 +++----- net/netfilter/nf_conntrack_netlink.c | 9 +- net/netfilter/nf_nat_core.c | 121 ++++++- net/netfilter/nf_tables_api.c | 6 +- net/netfilter/nft_compat.c | 6 +- net/netfilter/nft_log.c | 2 +- net/netfilter/nft_meta.c | 2 +- net/netfilter/nft_numgen.c | 2 +- net/netfilter/nft_set_pipapo.c | 13 +- net/netfilter/nft_tunnel.c | 5 +- tools/testing/selftests/net/netfilter/Makefile | 4 + tools/testing/selftests/net/netfilter/config | 1 + .../net/netfilter/conntrack_reverse_clash.c | 125 +++++++ .../net/netfilter/conntrack_reverse_clash.sh | 51 +++ tools/testing/selftests/net/netfilter/ipvs.sh | 2 +- tools/testing/selftests/net/netfilter/nft_queue.sh | 92 +++++- .../selftests/net/netfilter/nft_tproxy_tcp.sh | 358 +++++++++++++++++++++ .../selftests/net/netfilter/nft_tproxy_udp.sh | 262 +++++++++++++++ 22 files changed, 1091 insertions(+), 132 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.rsYUZT28BN b/tmp/tmp.l58xWMgSxP index 48c84b5e37b4..ae0e1dd98d9f 100644 --- a/tmp/tmp.rsYUZT28BN +++ b/tmp/tmp.l58xWMgSxP @@ -2,6 +2,8 @@ tc_action dbg profile patch selftests/bpf: Fix a btf_dump selftest failure forwarding: set timeout to 3 hours +cfg80211: Convert WARN_ON() to warning message +net: phy: qt2025: Fix warning: unused import DeviceId ipv4: avoid quadratic behavior in FIB insertion of common address net: gso: fix tcp fraglist segmentation after pull from frag_list tcp: check if skb is true to avoid crash