From a2620a29605b84edfeac45c203f15a15b21f4cdf Mon Sep 17 00:00:00 2001
From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Sat, 3 Mar 2018 14:04:02 +0100
Subject: ipset 6.36 released

---
 kernel/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'kernel/ChangeLog')

diff --git a/kernel/ChangeLog b/kernel/ChangeLog
index cad926b..703fb0c 100644
--- a/kernel/ChangeLog
+++ b/kernel/ChangeLog
@@ -1,3 +1,10 @@
+6.36
+  - Remove duplicate module description
+  - netfilter: remove messages print and boot/module load time
+    (Pablo Neira Ayuso)
+  - Fix wraparound bug introduced in commit 48596a8ddc46 in v6.34
+    (reported by Thomas Schwark)
+
 6.35
   - netfilter: mark expected switch fall-throughs (Gustavo A. R. Silva)
   - License cleanup: add SPDX GPL-2.0 license identifier to files with no
-- 
cgit v1.2.3