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

Merge in overtime fixes, no conflicts.

Signed-off-by: Jakub Kicinski <[email protected]>

2022-03-23 10:53:49 -07:00

..

ipv4

…

ipv6

…

br_netfilter.h

…

nf_conntrack_acct.h

netfilter: conntrack: remove extension register api

2022-02-04 06:30:28 +01:00

nf_conntrack_act_ct.h

…

nf_conntrack_bpf.h

net/netfilter: Add unstable CT lookup helpers for XDP and TC-BPF

2022-01-18 14:26:42 -08:00

nf_conntrack_bridge.h

…

nf_conntrack_core.h

…

nf_conntrack_count.h

…

nf_conntrack_ecache.h

netfilter: ecache: don't use nf_conn spinlock

2022-02-09 11:44:03 +01:00

nf_conntrack_expect.h

…

nf_conntrack_extend.h

netfilter: conntrack: remove extension register api

2022-02-04 06:30:28 +01:00

nf_conntrack_helper.h

netfilter: conntrack: Add and use nf_ct_set_auto_assign_helper_warned()

2022-03-20 00:29:35 +01:00

nf_conntrack_l4proto.h

…

nf_conntrack_labels.h

netfilter: conntrack: remove extension register api

2022-02-04 06:30:28 +01:00

nf_conntrack_seqadj.h

netfilter: conntrack: remove extension register api

2022-02-04 06:30:28 +01:00

nf_conntrack_synproxy.h

…

nf_conntrack_timeout.h

netfilter: cttimeout: use option structure

2022-02-09 11:56:06 +01:00

nf_conntrack_timestamp.h

netfilter: conntrack: remove extension register api

2022-02-04 06:30:28 +01:00

nf_conntrack_tuple.h

…

nf_conntrack_zones.h

…

nf_conntrack.h

Revert "netfilter: conntrack: tag conntracks picked up in local out hook"

2022-03-08 17:28:38 +01:00

nf_dup_netdev.h

…

nf_flow_table.h

netfilter: flowtable: Fix QinQ and pppoe support for inet table

2022-03-16 11:25:04 +01:00

nf_hooks_lwtunnel.h

…

nf_log.h

…

nf_nat_helper.h

…

nf_nat_masquerade.h

…

nf_nat_redirect.h

…

nf_nat.h

…

nf_queue.h

netfilter: nf_queue: fix possible use-after-free

2022-03-01 11:50:35 +01:00

nf_reject.h

…

nf_socket.h

…

nf_synproxy.h

…

nf_tables_core.h

netfilter: nft_cmp: optimize comparison for 16-bytes

2022-02-09 12:00:28 +01:00

nf_tables_ipv4.h

…

nf_tables_ipv6.h

…

nf_tables_offload.h

netfilter: nf_tables_offload: incorrect flow offload action array size

2022-02-20 01:22:20 +01:00

nf_tables.h

netfilter: nf_tables: cancel tracking for clobbered destination registers

2022-03-20 00:29:46 +01:00

nf_tproxy.h

…

nft_fib.h

netfilter: nft_fib: add reduce support

2022-03-20 00:29:47 +01:00

nft_meta.h

netfilter: nft_meta: extend reduce support to bridge family

2022-03-20 00:29:46 +01:00

nft_reject.h

…

xt_rateest.h

…