summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAlex Elder <aelder@sgi.com>2010-06-04 13:22:30 -0500
committerAlex Elder <aelder@sgi.com>2010-06-04 13:22:30 -0500
commit1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch)
treefdb99e686fa40e79cc53f80dfed58e9b548ed4eb /Documentation
parentad8456361fa19068cf49b50a4f98e41b73c08e76 (diff)
parentf9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff)
downloadlinux-3.10-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.gz
linux-3.10-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.tar.bz2
linux-3.10-1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/xfs-delayed-logging-design.txt5
1 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/filesystems/xfs-delayed-logging-design.txt b/Documentation/filesystems/xfs-delayed-logging-design.txt
index d8119e9d2d6..96d0df28bed 100644
--- a/Documentation/filesystems/xfs-delayed-logging-design.txt
+++ b/Documentation/filesystems/xfs-delayed-logging-design.txt
@@ -794,11 +794,6 @@ designed.
Roadmap:
-2.6.35 Inclusion in mainline as an experimental mount option
- => approximately 2-3 months to merge window
- => needs to be in xfs-dev tree in 4-6 weeks
- => code is nearing readiness for review
-
2.6.37 Remove experimental tag from mount option
=> should be roughly 6 months after initial merge
=> enough time to: