Merge tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 22:02:22 +0000 (14:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Jan 2019 22:02:22 +0000 (14:02 -0800)
Pull iomap maintainer update from Darrick Wong:
 "Christoph Hellwig and I have decided to take responsibility for the fs
  iomap code rather than let it languish further"

* tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  iomap: take responsibility for the filesystem iomap code

MAINTAINERS

index 5a0d1d4a905d8912b7337b9a3fb06fcdae4883f9..bc00793a03c828545c974ce19fe944b44aee87a5 100644 (file)
@@ -7890,6 +7890,18 @@ L:       linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/ioc3_serial.c
 
+IOMAP FILESYSTEM LIBRARY
+M:     Christoph Hellwig <hch@infradead.org>
+M:     Darrick J. Wong <darrick.wong@oracle.com>
+M:     linux-xfs@vger.kernel.org
+M:     linux-fsdevel@vger.kernel.org
+L:     linux-xfs@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
+S:     Supported
+F:     fs/iomap.c
+F:     include/linux/iomap.h
+
 IOMMU DRIVERS
 M:     Joerg Roedel <joro@8bytes.org>
 L:     iommu@lists.linux-foundation.org