Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[firefly-linux-kernel-4.4.55.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index dec901554ef7d58d8ad9de35431017e51b22a2fa..76112dac76592f4454fbdb20d43437079aef6c92 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -405,21 +405,6 @@ Who:       Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:  xt_connlimit rev 0
-When:  2012
-Who:   Jan Engelhardt <jengelh@medozas.de>
-Files: net/netfilter/xt_connlimit.c
-
-----------------------------
-
-What:  ipt_addrtype match include file
-When:  2012
-Why:   superseded by xt_addrtype
-Who:   Florian Westphal <fw@strlen.de>
-Files: include/linux/netfilter_ipv4/ipt_addrtype.h
-
-----------------------------
-
 What:  i2c_driver.attach_adapter
        i2c_driver.detach_adapter
 When:  September 2011
@@ -527,14 +512,6 @@ Who:       Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 
 ----------------------------
 
-What:  kmap_atomic(page, km_type)
-When:  3.5
-Why:   The old kmap_atomic() with two arguments is deprecated, we only
-       keep it for backward compatibility for few cycles and then drop it.
-Who:   Cong Wang <amwang@redhat.com>
-
-----------------------------
-
 What:  get_robust_list syscall
 When:  2013
 Why:   There appear to be no production users of the get_robust_list syscall,
@@ -593,6 +570,13 @@ Why:       Remount currently allows changing bound subsystems and
 
 ----------------------------
 
+What:  xt_recent rev 0
+When:  2013
+Who:   Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+
+----------------------------
+
 What:  KVM debugfs statistics
 When:  2013
 Why:   KVM tracepoints provide mostly equivalent information in a much more