summaryrefslogtreecommitdiffstats
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-06-23 16:07:34 +0200
committerTakashi Iwai <tiwai@suse.de>2010-06-23 16:07:34 +0200
commit1240e6b5532358257c52351639a8d2382fe58f84 (patch)
tree43d374ce976a41c6dcd12a70a51e0289093f8d07 /Documentation/filesystems
parentc9ff921abecda352e987a6aae169118a3fc9aa5d (diff)
parenta5c7d797dcce3be5e77cd6ea62cc4920ededc32b (diff)
downloadop-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.zip
op-kernel-dev-1240e6b5532358257c52351639a8d2382fe58f84.tar.gz
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'Documentation/filesystems')
-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 d8119e9..96d0df2 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:
OpenPOWER on IntegriCloud