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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1963 bytes --]

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@lists.infradead.or
  S:	Supported
  F:	drivers/usb/gadget/udc/atmel_usba_udc.*
  
 -MICROSEMI ETHERNET SWITCH DRIVER
 -M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
 -M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 -L:	netdev@vger.kernel.org
 +MICROCHIP WILC1000 WIFI DRIVER
 +M:	Ajay Singh <ajay.kathat@microchip.com>
 +M:	Claudiu Beznea <claudiu.beznea@microchip.com>
 +L:	linux-wireless@vger.kernel.org
  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@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>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Kalle Valo]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> 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 think this is trivial enough that Linus can take care of it without
any extra actions. Thanks for the report.

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

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

[Nicolas.Ferre]

On 17/07/2020 at 14:05, Kalle Valo wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
>> 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 think this is trivial enough that Linus can take care of it without
> any extra actions. Thanks for the report.

 From my perspective your resolution Stephen is good.

Thanks to both of you for the heads-up.

Best regards,
   Nicolas

> --
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
> 


-- 
Nicolas Ferre