Merge tag 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

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

1 files changed, 12 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5a0d1d4a905d..bc00793a03c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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