diff options
| author | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-06-04 14:22:30 -0400 |
| commit | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (patch) | |
| tree | fdb99e686fa40e79cc53f80dfed58e9b548ed4eb /Documentation | |
| parent | ad8456361fa19068cf49b50a4f98e41b73c08e76 (diff) | |
| parent | f9369729496a0f4c607a4cc1ea4dfeddbbfc505a (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/filesystems/xfs-delayed-logging-design.txt | 5 |
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. | |||
| 794 | 794 | ||
| 795 | Roadmap: | 795 | Roadmap: |
| 796 | 796 | ||
| 797 | 2.6.35 Inclusion in mainline as an experimental mount option | ||
| 798 | => approximately 2-3 months to merge window | ||
| 799 | => needs to be in xfs-dev tree in 4-6 weeks | ||
| 800 | => code is nearing readiness for review | ||
| 801 | |||
| 802 | 2.6.37 Remove experimental tag from mount option | 797 | 2.6.37 Remove experimental tag from mount option |
| 803 | => should be roughly 6 months after initial merge | 798 | => should be roughly 6 months after initial merge |
| 804 | => enough time to: | 799 | => enough time to: |