Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c210df6..baabfb9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7339,7 +7339,6 @@ F:        drivers/staging/gasket/
 
 GCC PLUGINS
 M:     Kees Cook <keescook@chromium.org>
-R:     Emese Revfy <re.emese@gmail.com>
 L:     linux-hardening@vger.kernel.org
 S:     Maintained
 F:     Documentation/kbuild/gcc-plugins.rst
@@ -8737,19 +8736,16 @@ F:      include/uapi/rdma/
 F:     samples/bpf/ibumad_kern.c
 F:     samples/bpf/ibumad_user.c
 
-INGENIC JZ4780 DMA Driver
-M:     Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
-S:     Maintained
-F:     drivers/dma/dma-jz4780.c
-
 INGENIC JZ4780 NAND DRIVER
 M:     Harvey Hunt <harveyhuntnexus@gmail.com>
 L:     linux-mtd@lists.infradead.org
+L:     linux-mips@vger.kernel.org
 S:     Maintained
 F:     drivers/mtd/nand/raw/ingenic/
 
 INGENIC JZ47xx SoCs
 M:     Paul Cercueil <paul@crapouillou.net>
+L:     linux-mips@vger.kernel.org
 S:     Maintained
 F:     arch/mips/boot/dts/ingenic/
 F:     arch/mips/generic/board-ingenic.c
@@ -9711,7 +9707,7 @@ F:        arch/arm64/kvm/
 F:     include/kvm/arm_*
 
 KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
-M:     Huacai Chen <chenhc@lemote.com>
+M:     Huacai Chen <chenhuacai@kernel.org>
 M:     Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
 L:     linux-mips@vger.kernel.org
 L:     kvm@vger.kernel.org
@@ -11853,7 +11849,7 @@ F:      drivers/*/*/*loongson2*
 F:     drivers/*/*loongson2*
 
 MIPS/LOONGSON64 ARCHITECTURE
-M:     Huacai Chen <chenhc@lemote.com>
+M:     Huacai Chen <chenhuacai@kernel.org>
 M:     Jiaxun Yang <jiaxun.yang@flygoat.com>
 L:     linux-mips@vger.kernel.org
 S:     Maintained