linux-stable/include/uapi/linux/netfilter
Jakub Kicinski b568d3072a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  418e53401e ("ice: move devlink port creation/deletion")
  643ef23bd9 ("ice: Introduce local var for readability")
https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/
https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/

drivers/net/ethernet/engleder/tsnep_main.c
  3d53aaef43 ("tsnep: Fix TX queue stop/wake for multiple queues")
  25faa6a4c5 ("tsnep: Replace TX spin_lock with __netif_tx_lock")
https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/

net/netfilter/nf_conntrack_proto_sctp.c
  13bd9b31a9 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b765148 ("netfilter: conntrack: unify established states for SCTP paths")
  f71cb8f45d ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")
https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/
https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-01-27 22:56:18 -08:00
..
ipset netfilter: ipset: Add support for new bitmask parameter 2022-11-30 18:55:36 +01:00
nf_conntrack_common.h netfilter: ctnetlink: disable helper autoassign 2022-02-04 05:39:57 +01:00
nf_conntrack_ftp.h
nf_conntrack_sctp.h netfilter: conntrack: unify established states for SCTP paths 2023-01-24 09:52:52 +01:00
nf_conntrack_tcp.h
nf_conntrack_tuple_common.h
nf_log.h
nf_nat.h netfilter: nft_nat: add netmap support 2020-04-28 00:53:54 +02:00
nf_synproxy.h treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers 2019-07-25 11:05:10 +02:00
nf_tables.h netfilter: nf_tables: add support to destroy operation 2023-01-18 13:09:00 +01:00
nf_tables_compat.h
nfnetlink.h netfilter: add new hook nfnl subsystem 2021-06-07 12:41:10 +02:00
nfnetlink_acct.h
nfnetlink_compat.h
nfnetlink_conntrack.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf 2021-09-03 16:20:37 -07:00
nfnetlink_cthelper.h uapi: nfnetlink_cthelper.h: fix userspace compilation error 2021-02-28 00:24:41 +01:00
nfnetlink_cttimeout.h netfilter: conntrack: unify established states for SCTP paths 2023-01-24 09:52:52 +01:00
nfnetlink_hook.h netfilter: nfnetlink_hook: missing chain family 2021-08-06 17:07:40 +02:00
nfnetlink_log.h netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h 2021-07-07 17:39:15 +02:00
nfnetlink_osf.h netfilter: uapi: fix linux/netfilter/nf_osf.h userspace compilation errors 2018-08-16 19:37:09 +02:00
nfnetlink_queue.h netfilter: nfqueue: enable to get skb->priority 2022-02-04 06:30:27 +01:00
x_tables.h treewide: uapi: Replace zero-length arrays with flexible-array members 2022-06-28 21:26:05 +02:00
xt_AUDIT.h headers: Remove some left-over license text in include/uapi/linux/netfilter/ 2022-09-21 10:44:56 +02:00
xt_CHECKSUM.h
xt_CLASSIFY.h
xt_CONNMARK.h
xt_CONNSECMARK.h
xt_CT.h
xt_DSCP.h
xt_HMARK.h
xt_IDLETIMER.h netfilter: xtables: Bring SPDX identifier back 2022-06-10 14:48:57 +02:00
xt_LED.h
xt_LOG.h
xt_MARK.h
xt_NFLOG.h
xt_NFQUEUE.h
xt_RATEEST.h
xt_SECMARK.h netfilter: xt_SECMARK: add new revision to fix structure layout 2021-05-03 23:02:44 +02:00
xt_SYNPROXY.h netfilter: rename nf_SYNPROXY.h to nf_synproxy.h 2019-07-04 02:29:47 +02:00
xt_TCPMSS.h
xt_TCPOPTSTRIP.h
xt_TEE.h
xt_TPROXY.h
xt_addrtype.h
xt_bpf.h
xt_cgroup.h netfilter: xt_cgroup: shrink size of v2 path 2018-09-17 16:11:03 +02:00
xt_cluster.h
xt_comment.h
xt_connbytes.h
xt_connlabel.h netfilter: add include guard to xt_connlabel.h 2019-07-29 15:13:41 +02:00
xt_connlimit.h
xt_connmark.h headers: Remove some left-over license text in include/uapi/linux/netfilter/ 2022-09-21 10:44:56 +02:00
xt_conntrack.h
xt_cpu.h
xt_dccp.h
xt_devgroup.h
xt_dscp.h
xt_ecn.h
xt_esp.h
xt_hashlimit.h
xt_helper.h
xt_ipcomp.h
xt_iprange.h
xt_ipvs.h
xt_l2tp.h
xt_length.h
xt_limit.h
xt_mac.h
xt_mark.h
xt_multiport.h
xt_nfacct.h netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info 2019-08-19 09:34:21 +02:00
xt_osf.h headers: Remove some left-over license text in include/uapi/linux/netfilter/ 2022-09-21 10:44:56 +02:00
xt_owner.h netfilter: xt_owner: bail out with EINVAL in case of unsupported flags 2019-06-17 16:36:30 +02:00
xt_physdev.h
xt_pkttype.h
xt_policy.h netfilter: add missing includes to a number of header-files. 2019-08-13 12:14:39 +02:00
xt_quota.h Revert "netfilter: xt_quota: fix the behavior of xt_quota module" 2018-10-19 14:00:34 +02:00
xt_rateest.h
xt_realm.h
xt_recent.h
xt_rpfilter.h
xt_sctp.h netfilter: uapi: Avoid undefined left-shift in xt_sctp.h 2019-12-09 13:02:07 +01:00
xt_set.h
xt_socket.h
xt_state.h
xt_statistic.h
xt_string.h
xt_tcpmss.h
xt_tcpudp.h
xt_time.h
xt_u32.h