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 <s...@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