| Message ID | 20200717165336.312dcf09@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees | expand |
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.
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 >
diff --cc MAINTAINERS index 07d6eae16e77,9af8f81f726d..000000000000 --- a/MAINTAINERS
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.