Jakub Kicinski 0f764eec3e Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== Netfilter fixes for net 1) Honor stateful expressions defined in the set from the dynset extension. The set definition provides a stateful expression that must be used by the dynset expression in case it is specified. 2) Missing timeout extension in the set element in the dynset extension leads to inconsistent ruleset listing, not allowing the user to restore timeout and expiration on ruleset reload. 3) Do not dump the stateful expression from the dynset extension if it coming from the set definition. * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf: netfilter: nft_dynset: dump expressions when set definition contains no expressions netfilter: nft_dynset: add timeout extension to template netfilter: nft_dynset: honor stateful expressions in set definition ==================== Link: https://lore.kernel.org/r/20210127132512.5472-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-01-27 17:53:46 -08:00
..
9p	9p: apply review requests for fid refcounting	2020-11-19 17:21:34 +01:00
bluetooth	Bluetooth: Change MGMT security info CMD to be more generic	2020-12-07 17:01:42 +02:00
caif
iucv
netfilter	netfilter: nft_dynset: honor stateful expressions in set definition	2021-01-16 18:57:26 +01:00
netns
nfc	net/nfc/nci: Support NCI 2.x initial sequence	2020-12-04 17:47:35 -08:00
phonet
sctp
tc_act
6lowpan.h
act_api.h	net/sched: sch_frag: add generic packet fragment support.	2020-11-27 14:36:02 -08:00
addrconf.h
af_ieee802154.h
af_rxrpc.h
af_unix.h
af_vsock.h
ah.h
arp.h
atmclip.h
ax25.h
ax88796.h
bareudp.h
bond_3ad.h
bond_alb.h
bond_options.h
bonding.h	bonding: fix feature flag setting at init time	2020-12-08 11:26:08 -08:00
bpf_sk_storage.h
busy_poll.h	net, xdp, xsk: fix __sk_mark_napi_id_once napi_id error	2020-12-01 15:51:19 +01:00
calipso.h
cfg80211-wext.h
cfg80211.h	cfg80211: fix a kerneldoc markup	2021-01-14 22:21:53 +01:00
cfg802154.h
checksum.h
cipso_ipv4.h
cls_cgroup.h
codel.h
codel_impl.h
codel_qdisc.h
compat.h	compat: always include linux/compat.h from net/compat.h	2020-11-23 13:31:54 -08:00
datalink.h
dcbevent.h
dcbnl.h
devlink.h	devlink: Add blackhole_nexthop trap	2020-11-24 12:14:56 -08:00
dn.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dsa.h
dsfield.h
dst.h
dst_cache.h
dst_metadata.h
dst_ops.h
erspan.h
esp.h
espintcp.h
ethoc.h
failover.h
fib_notifier.h
fib_rules.h
firewire.h
flow.h	lsm,selinux: pass flowi_common instead of flowi to the LSM hooks	2020-11-23 18:36:21 -05:00
flow_dissector.h
flow_offload.h
fou.h
fq.h
fq_impl.h
garp.h
gen_stats.h
genetlink.h
geneve.h
gre.h
gro_cells.h
gtp.h
gue.h
hwbm.h
icmp.h
ieee80211_radiotap.h
ieee802154_netdev.h
if_inet6.h
ife.h
ila.h
inet6_connection_sock.h
inet6_hashtables.h
inet_common.h
inet_connection_sock.h	tcp: fix TCP_USER_TIMEOUT with zero window	2021-01-18 19:59:17 -08:00
inet_ecn.h	inet_ecn: Use csum16_add() helper for IP_ECN_set_* helpers	2020-12-14 18:38:58 -08:00
inet_frag.h	inet: frags: batch fqdir destroy works	2020-12-12 15:08:54 -08:00
inet_hashtables.h	tcp: fix race condition when creating child sockets from syncookies	2020-11-23 16:32:33 -08:00
inet_sock.h
inet_timewait_sock.h
inetpeer.h
ip.h
ip6_checksum.h
ip6_fib.h
ip6_route.h
ip6_tunnel.h
ip_fib.h
ip_tunnels.h	Merge https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-19 19:08:46 -08:00
ip_vs.h
ipcomp.h
ipconfig.h
ipv6.h	ipv6: Remove dependency of ipv6_frag_thdr_truncated on ipv6 module	2020-11-19 10:49:50 -08:00
ipv6_frag.h	ipv6: Remove dependency of ipv6_frag_thdr_truncated on ipv6 module	2020-11-19 10:49:50 -08:00
ipv6_stubs.h
ipx.h
iw_handler.h
kcm.h
l3mdev.h
lag.h
lapb.h	net: lapb: Add locking to the lapb module	2021-01-26 17:53:45 -08:00
lib80211.h
llc.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
lwtunnel.h
mac80211.h	cfg80211/mac80211: fix kernel-doc for SAR APIs	2021-01-08 20:59:37 +01:00
mac802154.h
macsec.h
mip6.h
mld.h
mpls.h
mpls_iptunnel.h
mptcp.h	mptcp: add port support for ADD_ADDR suboption writing	2020-12-09 19:02:15 -08:00
mrp.h
ncsi.h
ndisc.h
neighbour.h	net: Exempt multicast addresses from five-second neighbor lifetime	2020-11-13 14:24:39 -08:00
net_failover.h
net_namespace.h	Networking updates for 5.11	2020-12-15 13:22:29 -08:00
net_ratelimit.h
netevent.h
netlabel.h
netlink.h	treewide: rename nla_strlcpy to nla_strscpy.	2020-11-16 08:08:54 -08:00
netprio_cgroup.h
netrom.h
nexthop.h
nl802154.h
nsh.h
p8022.h
page_pool.h	net: page_pool: Add bulk support for ptr_ring	2020-11-14 02:29:00 +01:00
pie.h
ping.h
pkt_cls.h	net: sched: remove redundant 'rtnl_held' argument	2020-12-01 11:24:56 -08:00
pkt_sched.h
pptp.h
protocol.h
psample.h
psnap.h
raw.h
rawv6.h
red.h	net: sched: prevent invalid Scell_log shift count	2020-12-28 14:52:54 -08:00
regulatory.h
request_sock.h
rose.h
route.h	lsm,selinux: pass flowi_common instead of flowi to the LSM hooks	2020-11-23 18:36:21 -05:00
rpl.h
rsi_91x.h
rtnetlink.h
rtnh.h
sch_generic.h	Networking updates for 5.11	2020-12-15 13:22:29 -08:00
scm.h
secure_seq.h
seg6.h
seg6_hmac.h
seg6_local.h
slhc_vj.h
smc.h
snmp.h
sock.h	tcp: fix TCP socket rehash stats mis-accounting	2021-01-19 19:47:20 -08:00
sock_reuseport.h
Space.h
stp.h
strparser.h
switchdev.h	bridge: switchdev: Notify about VLAN protocol changes	2020-12-01 15:21:13 -08:00
tcp.h	tcp: fix TLP timer not set when CA_STATE changes from DISORDER to OPEN	2021-01-23 21:33:01 -08:00
tcp_states.h
timewait_sock.h
tipc.h
tls.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-11-27 18:25:27 -08:00
tls_toe.h
transp_v6.h
tso.h
tun_proto.h
udp.h
udp_tunnel.h
udplite.h
vsock_addr.h
vxlan.h
wext.h
x25.h
x25device.h
xdp.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-11 22:29:38 -08:00
xdp_priv.h
xdp_sock.h	xsk: Fix race in SKB mode transmit with shared cq	2020-12-18 16:10:21 +01:00
xdp_sock_drv.h	xsk: Introduce batched Tx descriptor interfaces	2020-11-17 22:07:40 +01:00
xfrm.h
xsk_buff_pool.h	xsk: Fix race in SKB mode transmit with shared cq	2020-12-18 16:10:21 +01:00