linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the dmaengine tree got a conflict in:

  MAINTAINERS

between commit:

  5625f965d764 ("wilc1000: move wilc driver out of staging")

from the wireless-drivers-next tree, commit:

  6e701c299469 ("MAINTAINERS: merge entries for felix and ocelot drivers")

from Linus' tree and commit:

  c3846c4cce15 ("MAINTAINERS: dmaengine: Microchip: add Tudor Ambarus as co-maintainer")

from the dmaengine tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 07d6eae16e77,9af8f81f726d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11399,20 -11364,14 +11401,13 @@@ L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxx
  S:	Supported
  F:	drivers/usb/gadget/udc/atmel_usba_udc.*
  
 -MICROSEMI ETHERNET SWITCH DRIVER
 -M:	Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
 -M:	Microchip Linux Driver Support <UNGLinuxDriver@xxxxxxxxxxxxx>
 -L:	netdev@xxxxxxxxxxxxxxx
 +MICROCHIP WILC1000 WIFI DRIVER
 +M:	Ajay Singh <ajay.kathat@xxxxxxxxxxxxx>
 +M:	Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>
 +L:	linux-wireless@xxxxxxxxxxxxxxx
  S:	Supported
 -F:	drivers/net/ethernet/mscc/
 -F:	include/soc/mscc/ocelot*
 +F:	drivers/net/wireless/microchip/wilc1000/
  
- MICROCHIP XDMA DRIVER
- M:	Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx>
- L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
- L:	dmaengine@xxxxxxxxxxxxxxx
- S:	Supported
- F:	drivers/dma/at_xdmac.c
- 
  MICROSEMI MIPS SOCS
  M:	Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
  M:	Microchip Linux Driver Support <UNGLinuxDriver@xxxxxxxxxxxxx>

Attachment: pgpm1azz0Kkk0.pgp
Description: OpenPGP digital signature