From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vinod Koul <vkoul@kernel.org>, Kalle Valo <kvalo@codeaurora.org>,
Wireless <linux-wireless@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Ludovic Desroches <ludovic.desroches@microchip.com>,
Ajay Singh <ajay.kathat@microchip.com>,
Vladimir Oltean <vladimir.oltean@nxp.com>,
"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees
Date: Fri, 17 Jul 2020 16:53:36 +1000 [thread overview]
Message-ID: <20200717165336.312dcf09@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-07-17 6:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 6:53 Stephen Rothwell [this message]
2020-07-17 12:05 ` linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees Kalle Valo
2020-07-20 8:33 ` Nicolas.Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200717165336.312dcf09@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ajay.kathat@microchip.com \
--cc=davem@davemloft.net \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=vkoul@kernel.org \
--cc=vladimir.oltean@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).