summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-06-06 09:47:52 +0200
committerIngo Molnar <mingo@elte.hu>2010-06-06 09:47:52 +0200
commitd286040c4015a7a7012e536b63799279b95398ac (patch)
tree0a465f452b1a7b130a0974c5a2a46a815bbf33c2 /Documentation
parentb7af00411edfc9604f5820935a1dc9e71fee42f5 (diff)
parente44a21b7268a022c7749f521c06214145bd161e4 (diff)
Merge commit 'v2.6.35-rc2' into auto-latest
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 d8119e9d2d60..96d0df28bed3 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: