Jakub Kicinski 0314e382cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR (net-7.0-rc2). Conflicts: tools/testing/selftests/drivers/net/hw/rss_ctx.py 19c3a2a81d ("selftests: drv-net: rss: Generate unique ports for RSS context tests") ce5a0f4612 ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up") include/net/inet_connection_sock.h 858d2a4f67 ("tcp: fix potential race in tcp_v6_syn_recv_sock()") fcd3d039fa ("tcp: make tcp_v{4,6}_send_check() static") https://lore.kernel.org/aZ8PSFLzBrEU3I89@sirena.org.uk drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c 69050f8d6d ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types") bf4afc53b7 ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument") 8a96b9144f ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()") Adjacent changes: net/netfilter/ipvs/ip_vs_ctl.c c59bd9e62e ("ipvs: use more counters to avoid service lookups") bf4afc53b7 ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2026-02-26 10:23:00 -08:00
..
ipset	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
ipvs	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
Kconfig	netfilter: Exclude LEGACY TABLES on PREEMPT_RT.	2025-07-25 18:38:50 +02:00
Makefile	netfilter: flowtable: move path discovery infrastructure to its own file	2025-11-27 23:59:43 +00:00
core.c	netfilter: nf_dup{4, 6}: Move duplication check to task_struct	2025-05-23 13:57:12 +02:00
nf_bpf_link.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nf_conncount.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_conntrack_acct.c	…
nf_conntrack_amanda.c	netfilter: annotate NAT helper hook pointers with __rcu	2026-02-17 15:04:20 +01:00
nf_conntrack_bpf.c	Networking changes for 7.0	2026-02-11 19:31:52 -08:00
nf_conntrack_broadcast.c	netfilter: conntrack: remove skb argument from nf_ct_refresh	2025-01-19 16:41:55 +01:00
nf_conntrack_core.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_conntrack_ecache.c	net: replace use of system_wq with system_percpu_wq	2025-09-22 17:40:30 -07:00
nf_conntrack_expect.c	treewide, timers: Rename from_timer() to timer_container_of()	2025-06-08 09:07:37 +02:00
nf_conntrack_extend.c	…
nf_conntrack_ftp.c	netfilter: annotate NAT helper hook pointers with __rcu	2026-02-17 15:04:20 +01:00
nf_conntrack_h323_asn1.c	netfilter: nf_conntrack_h323: fix OOB read in decode_choice()	2026-02-26 12:50:42 +01:00
nf_conntrack_h323_main.c	netfilter: nf_conntrack_h323: don't pass uninitialised l3num value	2026-02-17 15:04:20 +01:00
nf_conntrack_h323_types.c	…
nf_conntrack_helper.c	netfilter: conntrack: helper: Replace -EEXIST by -EBUSY	2025-08-27 11:53:38 +02:00
nf_conntrack_irc.c	netfilter: annotate NAT helper hook pointers with __rcu	2026-02-17 15:04:20 +01:00
nf_conntrack_labels.c	…
nf_conntrack_netbios_ns.c	…
nf_conntrack_netlink.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_conntrack_ovs.c	net/ipv6: Introduce payload_len helpers	2026-02-06 20:50:03 -08:00
nf_conntrack_pptp.c	…
nf_conntrack_proto.c	netfilter: conntrack: remove DCCP protocol support	2025-07-03 13:51:39 +02:00
nf_conntrack_proto_generic.c	netfilter: nf_conntrack: Add allow_clash to generic protocol handler	2026-01-20 16:23:37 +01:00
nf_conntrack_proto_gre.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nf_conntrack_proto_icmp.c	netfilter: nf_conntrack: enable icmp clash support	2026-01-20 16:23:37 +01:00
nf_conntrack_proto_icmpv6.c	netfilter: nf_conntrack: enable icmp clash support	2026-01-20 16:23:37 +01:00
nf_conntrack_proto_sctp.c	netfilter: conntrack: cleanup timeout definitions	2025-01-12 20:21:01 -08:00
nf_conntrack_proto_tcp.c	move asm/unaligned.h to linux/unaligned.h	2024-10-02 17:23:23 -04:00
nf_conntrack_proto_udp.c	…
nf_conntrack_sane.c	…
nf_conntrack_seqadj.c	…
nf_conntrack_sip.c	netfilter: conntrack: remove skb argument from nf_ct_refresh	2025-01-19 16:41:55 +01:00
nf_conntrack_snmp.c	netfilter: annotate NAT helper hook pointers with __rcu	2026-02-17 15:04:20 +01:00
nf_conntrack_standalone.c	netfilter: conntrack: disable 0 value for conntrack_max setting	2025-10-30 12:52:45 +01:00
nf_conntrack_tftp.c	netfilter: annotate NAT helper hook pointers with __rcu	2026-02-17 15:04:20 +01:00
nf_conntrack_timeout.c	…
nf_conntrack_timestamp.c	…
nf_dup_netdev.c	netfilter: nf_dup_netdev: Move the recursion counter struct netdev_xmit	2025-05-23 13:57:12 +02:00
nf_flow_table_bpf.c	bpf: Remove redundant KF_TRUSTED_ARGS flag from all kfuncs	2026-01-02 12:04:28 -08:00
nf_flow_table_core.c	netfilter: flowtable: dedicated slab for flow entry	2026-02-06 13:34:55 +01:00
nf_flow_table_inet.c	net: netfilter: move nf flowtable bpf initialization in nf_flow_table_module_init()	2024-09-12 15:41:03 +02:00
nf_flow_table_ip.c	netfilter: flowtable: Add IP6IP6 tx sw acceleration	2026-01-29 09:52:06 +01:00
nf_flow_table_offload.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_flow_table_path.c	netfilter: nf_conntrack: don't rely on implicit includes	2026-01-20 16:23:37 +01:00
nf_flow_table_procfs.c	…
nf_flow_table_xdp.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nf_hooks_lwtunnel.c	sysctl: treewide: constify the ctl_table argument of proc_handlers	2024-07-24 20:59:29 +02:00
nf_internals.h	…
nf_log.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nf_log_syslog.c	net/ipv6: Introduce payload_len helpers	2026-02-06 20:50:03 -08:00
nf_nat_amanda.c	…
nf_nat_bpf.c	bpf: Remove redundant KF_TRUSTED_ARGS flag from all kfuncs	2026-01-02 12:04:28 -08:00
nf_nat_core.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_nat_ftp.c	…
nf_nat_helper.c	…
nf_nat_irc.c	…
nf_nat_masquerade.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nf_nat_ovs.c	netfilter: nf_conntrack: don't rely on implicit includes	2026-01-20 16:23:37 +01:00
nf_nat_proto.c	netfilter: nf_conntrack: don't rely on implicit includes	2026-01-20 16:23:37 +01:00
nf_nat_redirect.c	…
nf_nat_sip.c	…
nf_nat_tftp.c	…
nf_queue.c	…
nf_sockopt.c	…
nf_synproxy_core.c	netfilter: don't include xt and nftables.h in unrelated subsystems	2026-01-20 16:23:37 +01:00
nf_tables_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nf_tables_core.c	netfilter: nf_tables: Only use nf_skip_indirect_calls() when MITIGATION_RETPOLINE	2025-03-23 10:53:47 +01:00
nf_tables_offload.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nf_tables_trace.c	netfilter: nf_tables: hide clash bit from userspace	2025-07-14 15:22:35 +02:00
nfnetlink.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nfnetlink_acct.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nfnetlink_cthelper.c	Convert remaining multi-line kmalloc_obj/flex GFP_KERNEL uses	2026-02-22 08:26:33 -08:00
nfnetlink_cttimeout.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nfnetlink_hook.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nfnetlink_log.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nfnetlink_osf.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nfnetlink_queue.c	treewide: Replace kmalloc with kmalloc_obj for non-scalar types	2026-02-21 01:02:28 -08:00
nft_bitwise.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_byteorder.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_chain_filter.c	Revert "netfilter: nf_tables: Add notifications for hook changes"	2025-07-14 15:22:47 +02:00
nft_chain_nat.c	…
nft_chain_route.c	…
nft_cmp.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_compat.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_connlimit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_counter.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_ct.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_ct_fast.c	…
nft_dup_netdev.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_dynset.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_exthdr.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_fib.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_fib_inet.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_fib_netdev.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_flow_offload.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_fwd_netdev.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_hash.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_immediate.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_inner.c	netfilter: nft_inner: Use nested-BH locking for nft_pcpu_tun_ctx	2025-05-23 13:57:12 +02:00
nft_last.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_limit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_log.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_lookup.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_masq.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_meta.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_nat.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_numgen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_objref.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_osf.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_payload.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_queue.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_quota.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_range.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_redir.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_reject.c	netfilter: nf_tables: drop unused 3rd argument from validate callback ops	2024-09-03 10:47:17 +02:00
nft_reject_inet.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_reject_netdev.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_rt.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_set_bitmap.c	netfilter: nft_set_bitmap: fix lockdep splat due to missing annotation	2025-09-10 20:28:24 +02:00
nft_set_hash.c	netfilter: nft_set_hash: fix get operation on big endian	2026-02-06 13:34:55 +01:00
nft_set_pipapo.c	Convert 'alloc_flex' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
nft_set_pipapo.h	netfilter: nft_set_pipapo: Use nested-BH locking for nft_pipapo_scratch	2025-08-20 13:52:37 +02:00
nft_set_pipapo_avx2.c	netfilter: nft_set_pipapo_avx2: fix skip of expired entries	2025-09-24 11:50:28 +02:00
nft_set_pipapo_avx2.h	netfilter: nft_set_pipapo: use avx2 algorithm for insertions too	2025-08-20 13:52:37 +02:00
nft_set_rbtree.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2026-02-26 10:23:00 -08:00
nft_socket.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_synproxy.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_tproxy.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_tunnel.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
nft_xfrm.c	netfilter: nf_tables: remove register tracking infrastructure	2026-02-25 19:36:26 -08:00
utils.c	…
x_tables.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_AUDIT.c	audit: add audit_log_nf_skb helper function	2025-12-16 11:04:14 -05:00
xt_CHECKSUM.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_CLASSIFY.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_CONNSECMARK.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_CT.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_DSCP.c	…
xt_HL.c	…
xt_HMARK.c	…
xt_IDLETIMER.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_LED.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_LOG.c	…
xt_MASQUERADE.c	…
xt_NETMAP.c	…
xt_NFLOG.c	netfilter: xtables: fix typo causing some targets not to load on IPv6	2024-10-21 11:31:26 +02:00
xt_NFQUEUE.c	…
xt_RATEEST.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_REDIRECT.c	…
xt_SECMARK.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_TCPMSS.c	…
xt_TCPOPTSTRIP.c	netfilter: xtables: support arpt_mark and ipv6 optstrip for iptables-nft only builds	2025-05-22 17:16:02 +02:00
xt_TEE.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_TPROXY.c	…
xt_TRACE.c	netfilter: xtables: fix typo causing some targets not to load on IPv6	2024-10-21 11:31:26 +02:00
xt_addrtype.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_bpf.c	…
xt_cgroup.c	net: cgroup: Guard users of sock_cgroup_classid()	2025-04-24 16:04:02 +02:00
xt_cluster.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_comment.c	…
xt_connbytes.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_connlabel.c	…
xt_connlimit.c	netfilter: nf_conncount: rework API to use sk_buff directly	2025-11-28 00:05:49 +00:00
xt_connmark.c	netfilter: xtables: avoid NFPROTO_UNSPEC where needed	2024-10-09 23:20:46 +02:00
xt_conntrack.c	…
xt_cpu.c	…
xt_dccp.c	…
xt_devgroup.c	…
xt_dscp.c	…
xt_ecn.c	…
xt_esp.c	…
xt_hashlimit.c	Convert 'alloc_flex' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_helper.c	…
xt_hl.c	…
xt_ipcomp.c	…
xt_iprange.c	…
xt_ipvs.c	…
xt_l2tp.c	…
xt_length.c	…
xt_limit.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_mac.c	…
xt_mark.c	netfilter: xtables: support arpt_mark and ipv6 optstrip for iptables-nft only builds	2025-05-22 17:16:02 +02:00
xt_multiport.c	…
xt_nat.c	…
xt_nfacct.c	netfilter: xt_nfacct: don't assume acct name is null-terminated	2025-07-25 18:40:43 +02:00
xt_osf.c	…
xt_owner.c	…
xt_physdev.c	…
xt_pkttype.c	…
xt_policy.c	…
xt_quota.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_rateest.c	…
xt_realm.c	…
xt_recent.c	Convert 'alloc_flex' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_repldata.h	netfilter: xtables: Use strscpy() instead of strscpy_pad()	2025-03-23 10:53:47 +01:00
xt_sctp.c	…
xt_set.c	…
xt_socket.c	…
xt_state.c	…
xt_statistic.c	Convert 'alloc_obj' family to use the new default GFP_KERNEL argument	2026-02-21 17:09:51 -08:00
xt_string.c	…
xt_tcpmss.c	netfilter: xt_tcpmss: check remaining length before reading optlen	2026-01-20 16:23:38 +01:00
xt_tcpudp.c	…
xt_time.c	netfilter: xt_time: use is_leap_year() helper	2026-01-29 09:52:07 +01:00
xt_u32.c	…