1 files changed, 60 insertions, 0 deletions
diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index 0ee716d..1b05fbd 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,63 @@
+7.21
+  - netfilter: ipset: Suppress false sparse warnings
+  - tests: Verify module unload when sets with timeout were just destroyed
+  - netfilter: ipset: remove set destroy at ip_set module removal
+  - netfilter: ipset: Cleanup the code of destroy operation and explain
+    the two stages in comments
+  - netfilter: ipset: Missing gc cancellations fixed
+
+7.20
+  - treewide: Convert del_timer*() to timer_shutdown*() (Steven Rostedt)
+  - Use timer_shutdown_sync() when available, instead of del_timer_sync()
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v4
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v3
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test v2
+  - netfilter: ipset: fix race condition between swap/destroy and kernel
+    side add/del/test
+
+7.18
+  - netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
+    (reported by Kyle Zeng)
+  - netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for
+    ip_set_hash_netportnet.c (Kyle Zeng)
+  - compatibility: handle strscpy_pad()
+  - netfilter: ipset: refactor deprecated strncpy (Justin Stitt)
+  - netfilter: ipset: remove rcu_read_lock_bh pair from ip_set_test
+    (Florian Westphal)
+  - netfilter: ipset: Replace strlcpy with strscpy (Azeem Shaikh)
+  - netfilter: ipset: Add schedule point in call_ad(). (Kuniyuki Iwashima)
+  - net: Kconfig: fix spellos (Randy Dunlap)
+  - netfilter: ipset: Fix overflow before widen in the bitmap_ip_create()
+    function. (Gavrilov Ilia)
+
+7.17
+  - netfilter: ipset: Rework long task execution when adding/deleting entries
+  - netfilter: ipset: fix hash:net,port,net hang with /0 subnet
+
+7.16
+  - netfilter: ipset: restore allowing 64 clashing elements in hash:net,iface
+  - Fix all debug mode warnings
+  - netfilter: ipset: Add support for new bitmask parameter (Vishwanath Pai)
+  - netfilter: ipset: regression in ip_set_hash_ip.c (Vishwanath Pai)
+  - netfilter: move from strlcpy with unused retval to strscpy
+    (Wolfram Sang)
+  - compatibility: handle unsafe_memcpy()
+  - netlink: Bounds-check struct nlmsgerr creation (Kees Cook)
+  - compatibility: move to skb_protocol in the code from tc_skb_protocol
+  - Compatibility: check kvcalloc, kvfree, kvzalloc in slab.h too
+  - sched: consistently handle layer3 header accesses in the presence
+    of VLANs (Toke Høiland-Jørgensen)
+  - treewide: Replace GPLv2 boilerplate/reference with SPDX
+    - rule 500 (Thomas Gleixner)
+  - headers: Remove some left-over license text in 
+    include/uapi/linux/netfilter/ (Christophe JAILLET)
+  - netfilter: ipset: enforce documented limit to prevent allocating
+    huge memory
+  - netfilter: ipset: Fix oversized kvmalloc() calls
+
 7.15
   - netfilter: ipset: Fix maximal range check in hash_ipportnet4_uadt()
     (Nathan Chancellor)