Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26

[linux-2.6-omap-h63xx.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index ee3cc8b8c84ed991967637684b7996fe5c72d898..af0e9393bf684d62c70afcaa1c620709fceebb86 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -204,7 +204,7 @@ Who:  linuxppc-dev@ozlabs.org
 ---------------------------
 
 What:  i386/x86_64 bzImage symlinks
-When:  April 2008
+When:  April 2010
 
 Why:   The i386/x86_64 merge provides a symlink to the old bzImage
        location so not yet updated user space tools, e.g. package
@@ -281,3 +281,13 @@ Why:       Not used in-tree. The current out-of-tree users used it to
        code / infrastructure should be in the kernel and not in some
        out-of-tree driver.
 Who:   Thomas Gleixner <tglx@linutronix.de>
+
+---------------------------
+
+What:  /sys/o2cb symlink
+When:  January 2010
+Why:   /sys/fs/o2cb is the proper location for this information - /sys/o2cb
+       exists as a symlink for backwards compatibility for old versions of
+       ocfs2-tools. 2 years should be sufficient time to phase in new versions
+       which know to look in /sys/fs/o2cb.
+Who:   ocfs2-devel@oss.oracle.com