diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 07:33:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-05 07:33:05 -0700 |
| commit | 6c5de280b6683d194ee60cf22dee56eef0b09619 (patch) | |
| tree | 32306dcf4b2b0697d1113249c8eed3950a3a6c9d /Documentation | |
| parent | ed7dc1dfbcef301407a1e3138a49dc94e5a19d0a (diff) | |
| parent | 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5 (diff) | |
| download | linux-6c5de280b6683d194ee60cf22dee56eef0b09619.tar.bz2 | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: improve xfs_isilocked
xfs: skip writeback from reclaim context
xfs: remove done roadmap item from xfs-delayed-logging-design.txt
xfs: fix race in inode cluster freeing failing to stale inodes
xfs: fix access to upper inodes without inode64
xfs: fix might_sleep() warning when initialising per-ag tree
fs/xfs/quota: Add missing mutex_unlock
xfs: remove duplicated #include
xfs: convert more trace events to DEFINE_EVENT
xfs: xfs_trace.c: remove duplicated #include
xfs: Check new inode size is OK before preallocating
xfs: clean up xlog_align
xfs: cleanup log reservation calculactions
xfs: be more explicit if RT mount fails due to config
xfs: replace E2BIG with EFBIG where appropriate
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. 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: |