linux/net/ipv4/netfilter
Jakub Kicinski dad4d4b92a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.1-rc8).

Conflicts:

drivers/net/ethernet/wangxun/txgbe/txgbe_aml.c
  f67aead16e ("net: txgbe: rework service event handling")
  57d39faed4 ("net: txgbe: improve functions of AML 40G devices")

net/rds/info.c
  512db8267b ("rds: mark snapshot pages dirty in rds_info_getsockopt()")
  6e94eeb2a2 ("rds: convert to getsockopt_iter")

Adjacent changes:

include/net/sock.h
  1ee90b77b7 ("net: guard timestamp cmsgs to real error queue skbs")
  f0de88303d ("net: make is_skb_wmem() available to modules")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
History 2026-06-11 14:33:35 -07:00
..
arp_tables.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-06-11 14:33:35 -07:00
arpt_mangle.c netfilter: arp_tables: fix IEEE1394 ARP payload parsing 2026-04-21 12:44:39 +02:00
arptable_filter.c netfilter: x_tables: close dangling table module init race 2026-05-08 01:30:17 +02:00
ip_tables.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-06-11 14:33:35 -07:00
ipt_ah.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500 2019-06-19 17:09:55 +02:00
ipt_ECN.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2019-06-22 08:59:24 -04:00
ipt_REJECT.c netfilter: use actual socket sk for REJECT action 2020-12-01 14:33:55 +01:00
ipt_rpfilter.c ipv4: Convert ->flowi4_tos to dscp_t. 2025-08-26 17:34:31 -07:00
ipt_SYNPROXY.c netfilter: Add MODULE_DESCRIPTION entries to kernel modules 2020-06-25 00:50:31 +02:00
iptable_filter.c netfilter: x_tables: close dangling table module init race 2026-05-08 01:30:17 +02:00
iptable_mangle.c netfilter: x_tables: close dangling table module init race 2026-05-08 01:30:17 +02:00
iptable_nat.c netfilter: x_tables: add and use xtables_unregister_table_exit 2026-05-08 01:30:16 +02:00
iptable_raw.c netfilter: x_tables: close dangling table module init race 2026-05-08 01:30:17 +02:00
iptable_security.c netfilter: x_tables: close dangling table module init race 2026-05-08 01:30:17 +02:00
Kconfig netfilter: add back NETFILTER_XTABLES dependencies 2025-08-07 13:19:25 +02:00
Makefile netfilter: add option for GCOV profiling 2026-05-24 22:55:47 +02:00
nf_defrag_ipv4.c netfilter: add missing module descriptions 2023-11-08 13:52:32 +01:00
nf_dup_ipv4.c ipv4: Convert ->flowi4_tos to dscp_t. 2025-08-26 17:34:31 -07:00
nf_nat_h323.c netfilter: nf_conntrack: destroy stale expectfn expectations on unregister 2026-06-10 17:58:39 +02:00
nf_nat_pptp.c netfilter: conntrack: pptp: use single option structure 2022-02-04 06:30:28 +01:00
nf_nat_snmp_basic.asn1 treewide: Add SPDX identifier to IETF ASN.1 modules 2023-10-27 18:04:28 +08:00
nf_nat_snmp_basic_main.c netfilter: nf_conntrack_helper: dynamically allocate struct nf_conntrack_helper 2026-06-05 13:25:18 +02:00
nf_reject_ipv4.c ipv4: use dst4_mtu() instead of dst_mtu() 2026-02-02 17:49:29 -08:00
nf_socket_ipv4.c netfilter: nf_socket: skip socket lookup for non-first fragments 2026-04-30 17:59:01 +02:00
nf_tproxy_ipv4.c tcp: Don't pass hashinfo to socket lookup helpers. 2025-08-25 17:53:35 -07:00
nft_dup_ipv4.c netfilter: nf_tables: remove register tracking infrastructure 2026-02-25 19:36:26 -08:00
nft_fib_ipv4.c netfilter: nft_fib: fix stale stack leak via the OIFNAME register 2026-06-10 18:00:19 +02:00
nft_reject_ipv4.c netfilter: nf_tables: remove register tracking infrastructure 2026-02-25 19:36:26 -08:00