diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 17:37:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-22 17:37:47 +0100 |
| commit | 6ea9786e76d74350aee6cd9339c6f7cb765ba291 (patch) | |
| tree | a5ac36956a33cd1b2e349800333234876c311dc6 /MAINTAINERS | |
| parent | Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/pen... (diff) | |
| parent | xfs: open code inc_inode_iversion when logging an inode (diff) | |
| download | linux-6ea9786e76d74350aee6cd9339c6f7cb765ba291.tar.xz linux-6ea9786e76d74350aee6cd9339c6f7cb765ba291.zip | |
Merge tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs
Pull second xfs update from Ben Myers:
"There are a couple of patches that I wasn't quite sure about in time
for our initial 3.13 pull request, a bugfix, and an update to add Dave
to MAINTAINERS:
Here we have a performance fix for inode iversion, increased inode
cluster size for v5 superblock filesystems, a fix for error handling
in xfs_bmap_add_attrfork, and a MAINTAINERS update to add Dave"
* tag 'xfs-for-linus-v3.13-rc1-2' of git://oss.sgi.com/xfs/xfs:
xfs: open code inc_inode_iversion when logging an inode
xfs: increase inode cluster size for v5 filesystems
xfs: fix unlock in xfs_bmap_add_attrfork
xfs: update maintainers
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d9c97dce6635..8285ed4676b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9525,8 +9525,8 @@ F: drivers/xen/*swiotlb* XFS FILESYSTEM P: Silicon Graphics Inc +M: Dave Chinner <dchinner@fromorbit.com> M: Ben Myers <bpm@sgi.com> -M: Alex Elder <elder@kernel.org> M: xfs@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs |