2 files changed, 23 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 9d3a0775a11d..87851efb0228 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -258,3 +258,19 @@ Why:	These drivers never compiled since they were added to the kernel
 Who:    Jean Delvare <khali@linux-fr.org>
 
 ---------------------------
+
+What:   Bridge netfilter deferred IPv4/IPv6 output hook calling
+When:   January 2007
+Why:    The deferred output hooks are a layering violation causing unusual
+        and broken behaviour on bridge devices. Examples of things they
+        break include QoS classifation using the MARK or CLASSIFY targets,
+        the IPsec policy match and connection tracking with VLANs on a
+        bridge. Their only use is to enable bridge output port filtering
+        within iptables with the physdev match, which can also be done by
+        combining iptables and ebtables using netfilter marks. Until it
+        will get removed the hook deferral is disabled by default and is
+        only enabled when needed.
+
+Who:    Patrick McHardy <kaber@trash.net>
+
+---------------------------
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt
index 6887d44d2661..6da24e7a56cb 100644
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
@@ -238,6 +238,13 @@ Debugging
   pagefaulttrace Dump all page faults. Only useful for extreme debugging
                 and will create a lot of output.
 
+  call_trace=[old|both|newfallback|new]
+                old: use old inexact backtracer
+                new: use new exact dwarf2 unwinder
+                both: print entries from both
+                newfallback: use new unwinder but fall back to old if it gets
+                        stuck (default)
+
 Misc
 
   noreplacement  Don't replace instructions with more appropriate ones