powerpc/mm: Fix build error with FLATMEM book3s64 config

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e17ebf70b5480ecc232ce1f62aedf95a03b5f403..e9e3783fd3236a1c934b40f1e71d90f40061b087 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2356,7 +2356,7 @@ F:        arch/arm/mm/cache-uniphier.c
 F:     arch/arm64/boot/dts/socionext/uniphier*
 F:     drivers/bus/uniphier-system-bus.c
 F:     drivers/clk/uniphier/
-F:     drivers/dmaengine/uniphier-mdmac.c
+F:     drivers/dma/uniphier-mdmac.c
 F:     drivers/gpio/gpio-uniphier.c
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/irqchip/irq-uniphier-aidet.c
@@ -6408,7 +6408,6 @@ L:        linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
 S:     Maintained
 F:     kernel/futex.c
-F:     kernel/futex_compat.c
 F:     include/asm-generic/futex.h
 F:     include/linux/futex.h
 F:     include/uapi/linux/futex.h
@@ -7386,13 +7385,12 @@ S:      Supported
 F:     drivers/net/ethernet/ibm/ibmvnic.*
 
 IBM Power Virtual Accelerator Switchboard
-M:     Sukadev Bhattiprolu
+M:     Sukadev Bhattiprolu <sukadev@linux.ibm.com>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     arch/powerpc/platforms/powernv/vas*
 F:     arch/powerpc/platforms/powernv/copy-paste.h
 F:     arch/powerpc/include/asm/vas.h
-F:     arch/powerpc/include/uapi/asm/vas.h
 
 IBM Power Virtual Ethernet Device Driver
 M:     Thomas Falcon <tlfalcon@linux.ibm.com>
@@ -7439,14 +7437,14 @@ F:      drivers/crypto/vmx/ghash*
 F:     drivers/crypto/vmx/ppc-xlate.pl
 
 IBM Power PCI Hotplug Driver for RPA-compliant PPC64 platform
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-pci@vger.kernel.org
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 F:     drivers/pci/hotplug/rpaphp*
 
 IBM Power IO DLPAR Driver for RPA-compliant PPC64 platform
-M:     Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
+M:     Tyrel Datwyler <tyreld@linux.ibm.com>
 L:     linux-pci@vger.kernel.org
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
@@ -8096,6 +8094,16 @@ F:       include/linux/iommu.h
 F:     include/linux/of_iommu.h
 F:     include/linux/iova.h
 
+IO_URING
+M:     Jens Axboe <axboe@kernel.dk>
+L:     linux-block@vger.kernel.org
+L:     linux-fsdevel@vger.kernel.org
+T:     git git://git.kernel.dk/linux-block
+T:     git git://git.kernel.dk/liburing
+S:     Maintained
+F:     fs/io_uring.c
+F:     include/uapi/linux/io_uring.h
+
 IP MASQUERADING
 M:     Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
 S:     Maintained
@@ -10378,7 +10386,7 @@ F:      arch/arm/mach-mmp/
 
 MMU GATHER AND TLB INVALIDATION
 M:     Will Deacon <will.deacon@arm.com>
-M:     "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
+M:     "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
 M:     Nick Piggin <npiggin@gmail.com>
 M:     Peter Zijlstra <peterz@infradead.org>