[PATCH v2] MAINTAINERS: dma: Microchip: add Tudor Ambarus as co-maintainer

[PATCH v2] MAINTAINERS: dma: Microchip: add Tudor Ambarus as co-maintainer

[Ludovic Desroches]

Add Tudor Ambarus as co-maintainer for both Microchip DMA drivers and
take the opportunity to merge both entries.

Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com>
---

v2:
 - Rename the entry to be more specific and to avoid collision with other
   Microchip's DMA drivers.

 MAINTAINERS | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index ea296f213e45..4a0a28c59bb3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11240,6 +11240,19 @@ W:	http://www.monstr.eu/fdt/
 T:	git git://git.monstr.eu/linux-2.6-microblaze.git
 F:	arch/microblaze/
 
+MICROCHIP AT91 DMA DRIVERS
+M:	Ludovic Desroches <ludovic.desroches@microchip.com>
+M:	Tudor Ambarus <tudor.ambarus@microchip.com>
+L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:	dmaengine@vger.kernel.org
+S:	Supported
+F:	Documentation/devicetree/bindings/dma/atmel-dma.txt
+F:	drivers/dma/at_hdmac.c
+F:	drivers/dma/at_hdmac_regs.h
+F:	drivers/dma/at_xdmac.c
+F:	include/dt-bindings/dma/at91.h
+F:	include/linux/platform_data/dma-atmel.h
+
 MICROCHIP AT91 SERIAL DRIVER
 M:	Richard Genoud <richard.genoud@gmail.com>
 S:	Maintained
@@ -11268,17 +11281,6 @@ L:	alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:	Supported
 F:	sound/soc/atmel
 
-MICROCHIP DMA DRIVER
-M:	Ludovic Desroches <ludovic.desroches@microchip.com>
-L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-L:	dmaengine@vger.kernel.org
-S:	Supported
-F:	Documentation/devicetree/bindings/dma/atmel-dma.txt
-F:	drivers/dma/at_hdmac.c
-F:	drivers/dma/at_hdmac_regs.h
-F:	include/dt-bindings/dma/at91.h
-F:	include/linux/platform_data/dma-atmel.h
-
 MICROCHIP ECC DRIVER
 M:	Tudor Ambarus <tudor.ambarus@microchip.com>
 L:	linux-crypto@vger.kernel.org
@@ -11415,13 +11417,6 @@ L:	linux-wireless@vger.kernel.org
 S:	Supported
 F:	drivers/net/wireless/microchip/wilc1000/
 
-MICROCHIP XDMA DRIVER
-M:	Ludovic Desroches <ludovic.desroches@microchip.com>
-L:	linux-arm-kernel@lists.infradead.org
-L:	dmaengine@vger.kernel.org
-S:	Supported
-F:	drivers/dma/at_xdmac.c
-
 MICROSEMI MIPS SOCS
 M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
 M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
-- 
2.24.0

Re: [PATCH v2] MAINTAINERS: dma: Microchip: add Tudor Ambarus as co-maintainer

[Vinod Koul]

On 16-07-20, 09:15, Ludovic Desroches wrote:
> Add Tudor Ambarus as co-maintainer for both Microchip DMA drivers and
> take the opportunity to merge both entries.

Applied after changing dma->dmaengine, thanks
I have conflict while applying, please check

-- 
~Vinod

Re: [PATCH v2] MAINTAINERS: dma: Microchip: add Tudor Ambarus as co-maintainer

[Ludovic Desroches]

On Fri, Jul 17, 2020 at 11:47:53AM +0530, Vinod Koul wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On 16-07-20, 09:15, Ludovic Desroches wrote:
> > Add Tudor Ambarus as co-maintainer for both Microchip DMA drivers and
> > take the opportunity to merge both entries.
> 
> Applied after changing dma->dmaengine, thanks
> I have conflict while applying, please check

Sounds good.

Thanks

Ludovic

> 
> --
> ~Vinod