summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-04 18:33:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-04 18:33:35 -0800
commite02003b515e8d95f40f20f213622bb82510873d2 (patch)
tree78f7e5cfdc4cc626a8138dd1bd9428bca24c4000 /MAINTAINERS
parent4cf184638bcf2bdd1bcbc661f4717b648ad4ce40 (diff)
parentff97f2399edac1e0fb3fa7851d5fbcbdf04717cf (diff)
downloadlinux-e02003b515e8d95f40f20f213622bb82510873d2.tar.gz
linux-e02003b515e8d95f40f20f213622bb82510873d2.tar.bz2
linux-e02003b515e8d95f40f20f213622bb82510873d2.zip
Merge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong: - fixes for crashes and double-cleanup errors - XFS maintainership handover - fix to prevent absurdly large block reservations - fix broken sysfs getter/setters * tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: xfs: fix max_retries _show and _store functions xfs: update MAINTAINERS xfs: fix crash and data corruption due to removal of busy COW extents xfs: use the actual AG length when reserving blocks xfs: fix double-cleanup when CUI recovery fails
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 97d0b689270a..ea11bb03f550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13534,11 +13534,11 @@ F: arch/x86/xen/*swiotlb*
F: drivers/xen/*swiotlb*
XFS FILESYSTEM
-M: Dave Chinner <david@fromorbit.com>
+M: Darrick J. Wong <darrick.wong@oracle.com>
M: linux-xfs@vger.kernel.org
L: linux-xfs@vger.kernel.org
W: http://xfs.org/
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
+T: git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
S: Supported
F: Documentation/filesystems/xfs.txt
F: fs/xfs/