Merge branch 'xarray' of git://git.infradead.org/users/willy/linux-dax

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bfc9722..a78d457 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -535,7 +535,7 @@ F:  Documentation/hwmon/adt7475
 F:     drivers/hwmon/adt7475.c
 
 ADVANSYS SCSI DRIVER
-M:     Matthew Wilcox <matthew@wil.cx>
+M:     Matthew Wilcox <willy@infradead.org>
 M:     Hannes Reinecke <hare@suse.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
@@ -4393,7 +4393,7 @@ S:        Maintained
 F:     drivers/i2c/busses/i2c-diolan-u2c.c
 
 FILESYSTEM DIRECT ACCESS (DAX)
-M:     Matthew Wilcox <mawilcox@microsoft.com>
+M:     Matthew Wilcox <willy@infradead.org>
 M:     Ross Zwisler <zwisler@kernel.org>
 M:     Jan Kara <jack@suse.cz>
 L:     linux-fsdevel@vger.kernel.org
@@ -8697,7 +8697,7 @@ F:        drivers/message/fusion/
 F:     drivers/scsi/mpt3sas/
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
-M:     Matthew Wilcox <matthew@wil.cx>
+M:     Matthew Wilcox <willy@infradead.org>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/sym53c8xx_2/
@@ -16137,6 +16137,17 @@ T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso
 S:     Maintained
 F:     arch/x86/entry/vdso/
 
+XARRAY
+M:     Matthew Wilcox <willy@infradead.org>
+L:     linux-fsdevel@vger.kernel.org
+S:     Supported
+F:     Documentation/core-api/xarray.rst
+F:     lib/idr.c
+F:     lib/xarray.c
+F:     include/linux/idr.h
+F:     include/linux/xarray.h
+F:     tools/testing/radix-tree
+
 XC2028/3028 TUNER DRIVER
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
 L:     linux-media@vger.kernel.org