Jakub Kicinski cc4e5eecd4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ... Pablo Neira Ayuso says: ==================== Netfilter fixes for net The following patchset contains Netfilter fixes for net: 1) Restrict range element expansion in ipset to avoid soft lockup, from Jozsef Kadlecsik. 2) Memleak in error path for nf_conntrack_bridge for IPv4 packets, from Yajun Deng. 3) Simplify conntrack garbage collection strategy to avoid frequent wake-ups, from Florian Westphal. 4) Fix NFNLA_HOOK_FUNCTION_NAME string, do not include module name. 5) Missing chain family netlink attribute in chain description in nfnetlink_hook. 6) Incorrect sequence number on nfnetlink_hook dumps. 7) Use netlink request family in reply message for consistency. 8) Remove offload_pickup sysctl, use conntrack for established state instead, from Florian Westphal. 9) Translate NFPROTO_INET/ingress to NFPROTO_NETDEV/ingress, since NFPROTO_INET is not exposed through nfnetlink_hook. * git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf: netfilter: nfnetlink_hook: translate inet ingress to netdev netfilter: conntrack: remove offload_pickup sysctl again netfilter: nfnetlink_hook: Use same family as request message netfilter: nfnetlink_hook: use the sequence number of the request message netfilter: nfnetlink_hook: missing chain family netfilter: nfnetlink_hook: strip off module name from hookfn netfilter: conntrack: collect all entries in one cycle netfilter: nf_conntrack_bridge: Fix memory leak when error netfilter: ipset: Limit the maximal range of consecutive elements to add/delete ==================== Link: https://lore.kernel.org/r/20210806151149.6356-1-pablo@netfilter.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-06 08:44:50 -07:00
..
caif	tty: cumulate and document tty_struct::flow* members	2021-05-13 16:57:16 +02:00
device_drivers	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
devlink	Networking changes for 5.14.	2021-06-30 15:51:09 -07:00
dsa	net: dsa: delete dsa_legacy_fdb_add and dsa_legacy_fdb_del	2021-06-29 10:46:23 -07:00
mac80211_hwsim	docs: net: convert two README files to ReST format	2019-07-31 13:31:56 -06:00
6lowpan.rst	docs: networking: convert 6lowpan.txt to ReST	2020-02-28 14:52:36 +01:00
6pack.rst	docs: networking: convert 6pack.txt to ReST	2020-04-28 14:38:38 -07:00
af_xdp.rst	doc, af_xdp: Fix bind flags option typo	2021-07-12 16:55:01 +02:00
alias.rst
arcnet-hardware.rst	docs: networking: arcnet-hardware.rst: don't duplicate chapter names	2020-05-01 12:24:43 -07:00
arcnet.rst	Documentation: networking: arcnet: drop doubled word	2020-07-04 17:46:21 -07:00
atm.rst	docs: networking: convert atm.txt to ReST	2020-04-28 14:38:38 -07:00
ax25.rst	Documentation: networking: ax25: drop doubled word	2020-07-04 17:46:21 -07:00
bareudp.rst	Documentation: bareudp: Corrected description of bareudp module.	2020-07-28 17:53:03 -07:00
batman-adv.rst	batman-adv: Fix typos and grammar in documentation	2020-06-26 10:36:30 +02:00
bonding.rst	docs: networking: bonding.rst Fix a typo in bonding.rst	2021-03-01 13:53:21 -08:00
bridge.rst
can.rst	can: add a note that RECV_OWN_MSGS frames are subject to filtering	2021-04-24 14:36:51 +02:00
can_ucan_protocol.rst	Documentation: networking: can_ucan_protocol: drop doubled words	2020-07-04 17:46:21 -07:00
cdc_mbim.rst	docs: networking: convert cdc_mbim.txt to ReST	2020-04-28 14:38:39 -07:00
checksum-offloads.rst	docs: networking: convert netdev-features.txt to ReST	2020-04-30 12:56:36 -07:00
dccp.rst	net: dccp: Add SIOCOUTQ IOCTL support (send buffer fill)	2020-07-22 17:00:37 -07:00
dctcp.rst	docs: networking: convert dctcp.txt to ReST	2020-04-28 14:38:39 -07:00
decnet.rst	docs: networking: convert decnet.txt to ReST	2020-04-28 14:39:45 -07:00
dns_resolver.rst	docs: networking: convert dns_resolver.txt to ReST	2020-04-28 14:39:46 -07:00
driver.rst	docs: networking: convert driver.txt to ReST	2020-04-28 14:39:46 -07:00
eql.rst	docs: networking: convert eql.txt to ReST	2020-04-28 14:39:46 -07:00
ethtool-netlink.rst	ethtool: add a new command for getting PHC virtual clocks	2021-07-01 13:08:18 -07:00
failover.rst
fib_trie.rst	docs: networking: convert fib_trie.txt to ReST	2020-04-28 14:39:46 -07:00
filter.rst	bpf, docs: Fix literal block for example code	2021-04-27 17:31:09 +02:00
gen_stats.rst	docs: networking: convert gen_stats.txt to ReST	2020-04-28 14:39:46 -07:00
generic-hdlc.rst	docs: networking: convert generic-hdlc.txt to ReST	2020-04-28 14:39:46 -07:00
generic_netlink.rst	docs: networking: convert generic_netlink.txt to ReST	2020-04-28 14:39:46 -07:00
gtp.rst	docs: networking: convert gtp.txt to ReST	2020-04-28 14:39:46 -07:00
ieee802154.rst	docs: net: ieee802154.rst: fix C expressions	2020-10-15 07:49:41 +02:00
ila.rst	docs: networking: convert ila.txt to ReST	2020-04-28 14:39:47 -07:00
index.rst	Documentation: net: Document resilient next-hop groups	2021-03-29 13:51:38 -07:00
ip-sysctl.rst	tcp: disable TFO blackhole logic by default	2021-07-21 22:50:31 -07:00
ip_dynaddr.rst	docs: networking: convert ip_dynaddr.txt to ReST	2020-04-28 14:39:47 -07:00
ipddp.rst	docs: networking: convert ipddp.txt to ReST	2020-04-28 14:39:47 -07:00
ipsec.rst	docs: networking: convert ipsec.txt to ReST	2020-04-28 14:39:47 -07:00
ipv6.rst	docs: networking: convert ipv6.txt to ReST	2020-04-28 14:40:18 -07:00
ipvlan.rst	docs: networking: convert ipvlan.txt to ReST	2020-04-28 14:40:18 -07:00
ipvs-sysctl.rst	Documentation: networking: ipvs-sysctl: drop doubled word	2020-07-04 17:46:21 -07:00
j1939.rst	can: j1939: add tables for the CAN identifier and its fields	2020-11-20 09:43:29 +01:00
kapi.rst	wimax: move out to staging	2020-10-29 19:27:45 +01:00
kcm.rst	docs: networking: convert kcm.txt to ReST	2020-04-28 14:40:19 -07:00
l2tp.rst	docs: networking: add tracepoint info to l2tp.rst	2020-08-22 12:44:37 -07:00
lapb-module.rst	docs: networking: convert lapb-module.txt to ReST	2020-04-30 12:56:35 -07:00
mac80211-auth-assoc-deauth.txt
mac80211-injection.rst	doc: networking: wireless: fix wiki website url	2020-06-08 10:05:53 +02:00
mpls-sysctl.rst	docs: networking: convert mpls-sysctl.txt to ReST	2020-04-30 12:56:36 -07:00
mptcp-sysctl.rst	mptcp: add sysctl allow_join_initial_addr_port	2021-06-22 14:36:01 -07:00
msg_zerocopy.rst
multiqueue.rst	docs: networking: convert multiqueue.txt to ReST	2020-04-30 12:56:36 -07:00
net_dim.rst	docs: networking: add full DIM API	2020-04-10 18:11:04 -07:00
net_failover.rst	docs: networking: net_failover: Fix a few typos	2020-03-03 16:07:02 -08:00
netconsole.rst	docs: networking: convert netconsole.txt to ReST	2020-04-30 12:56:36 -07:00
netdev-FAQ.rst	docs: networking: netdevsim rules	2021-08-04 12:43:27 +01:00
netdev-features.rst	net: hsr: add offloading support	2021-02-11 13:24:44 -08:00
netdevices.rst	docs: net: explain struct net_device lifetime	2021-01-08 19:27:41 -08:00
netfilter-sysctl.rst	docs: networking: convert netfilter-sysctl.txt to ReST	2020-04-30 12:56:36 -07:00
netif-msg.rst	docs: networking: convert netif-msg.txt to ReST	2020-04-30 12:56:36 -07:00
nexthop-group-resilient.rst	Documentation: net: Document resilient next-hop groups	2021-03-29 13:51:38 -07:00
nf_conntrack-sysctl.rst	netfilter: conntrack: remove offload_pickup sysctl again	2021-08-06 17:07:41 +02:00
nf_flowtable.rst	docs: nf_flowtable: fix compilation and warnings	2021-03-25 17:42:02 -07:00
nfc.rst	docs: networking: nfc: change to rst format	2019-11-23 11:00:19 -08:00
openvswitch.rst	docs: networking: convert openvswitch.txt to ReST	2020-04-30 12:56:36 -07:00
operstates.rst	docs: operstates: document IF_OPER_TESTING	2021-08-02 15:16:04 +01:00
packet_mmap.rst	docs: networking: Replace strncpy() with strscpy()	2021-06-04 11:21:43 -06:00
page_pool.rst	net: page_pool: Add page_pool_put_page_bulk() to page_pool.rst	2020-11-24 14:56:54 -08:00
phonet.rst	docs: networking: convert phonet.txt to ReST	2020-04-30 12:56:37 -07:00
phy.rst	net: phy: Add 25G BASE-R interface mode	2021-06-12 13:08:57 -07:00
pktgen.rst	docs: networking: convert pktgen.txt to ReST	2020-04-30 12:56:37 -07:00
plip.rst	docs: networking: convert PLIP.txt to ReST	2020-04-30 12:56:37 -07:00
ppp_generic.rst	docs: update ppp_generic.rst to document new ioctls	2020-12-10 13:57:36 -08:00
proc_net_tcp.rst	docs: networking: convert proc_net_tcp.txt to ReST	2020-04-30 12:56:37 -07:00
radiotap-headers.rst	docs: networking: convert radiotap-headers.txt to ReST	2020-04-30 12:56:37 -07:00
rds.rst	docs: networking: convert rds.txt to ReST	2020-04-30 12:56:37 -07:00
regulatory.rst	doc: networking: wireless: fix wiki website url	2020-06-08 10:05:53 +02:00
rxrpc.rst	Documentation: networking: rxrpc: drop doubled word	2020-07-04 17:46:21 -07:00
scaling.rst	docs: networking: update XPS to account for netif_set_xps_queue	2020-10-13 16:21:54 -07:00
sctp.rst	docs: networking: convert sctp.txt to ReST	2020-04-30 12:56:38 -07:00
secid.rst	docs: networking: convert secid.txt to ReST	2020-04-30 12:56:38 -07:00
seg6-sysctl.rst	doc: move seg6_flowlabel to seg6-sysctl.rst	2021-04-14 13:13:15 -07:00
segmentation-offloads.rst
sfp-phylink.rst	net: mdio: Remove of_phy_attach()	2021-02-17 13:17:49 -08:00
snmp_counter.rst	net-next: docs: Fix typos in snmp_counter.rst	2021-01-05 17:07:38 -08:00
statistics.rst	docs: networking: extend the statistics documentation	2021-04-16 16:59:20 -07:00
strparser.rst	docs: networking: convert strparser.txt to ReST	2020-04-30 12:56:38 -07:00
switchdev.rst	Documentation: networking: switchdev: add missing "and" word	2021-03-17 12:34:34 -07:00
sysfs-tagging.rst	Documentation: better locations for sysfs-pci, sysfs-tagging	2020-10-09 09:33:23 -06:00
tc-actions-env-rules.rst	docs: networking: convert tc-actions-env-rules.txt to ReST	2020-04-30 12:56:38 -07:00
tcp-thin.rst	docs: networking: convert tcp-thin.txt to ReST	2020-04-30 12:56:38 -07:00
team.rst	docs: networking: convert team.txt to ReST	2020-04-30 12:56:38 -07:00
timestamping.rst	docs: networking: timestamping: update for DSA switches	2021-04-27 14:10:15 -07:00
tipc.rst	Documentation: add more details in tipc.rst	2021-07-01 13:18:18 -07:00
tls-offload-layers.svg
tls-offload-reorder-bad.svg
tls-offload-reorder-good.svg
tls-offload.rst	net: Disable NETIF_F_HW_TLS_RX when RXCSUM is disabled	2021-01-19 15:58:05 -08:00
tls.rst	net/tls: add TlsDeviceRxResync statistic	2019-10-05 16:29:00 -07:00
tproxy.rst	docs: networking: convert tproxy.txt to ReST	2020-04-30 12:56:38 -07:00
tuntap.rst	docs: networking: Replace strncpy() with strscpy()	2021-06-04 11:21:43 -06:00
udplite.rst	docs: networking: convert udplite.txt to ReST	2020-05-01 12:24:40 -07:00
vrf.rst	docs: networking: convert vrf.txt to ReST	2020-05-01 12:24:40 -07:00
vxlan.rst	docs: vxlan: add info about device features	2020-09-28 12:50:12 -07:00
x25-iface.rst	net: x25: Queue received packets in the drivers instead of per-CPU queues	2021-04-05 11:42:12 -07:00
x25.rst	net: x25: Remove unimplemented X.25-over-LLC code stubs	2020-12-12 17:15:33 -08:00
xfrm_device.rst	docs: networking: Fix a typo	2021-03-20 19:02:42 -07:00
xfrm_proc.rst	docs: networking: convert xfrm_proc.txt to ReST	2020-05-01 12:24:40 -07:00
xfrm_sync.rst	docs: networking: convert xfrm_sync.txt to ReST	2020-05-01 12:24:41 -07:00
xfrm_sysctl.rst	docs: networking: convert xfrm_sysctl.txt to ReST	2020-05-01 12:24:41 -07:00