Messages in this thread | | | From | Kalle Valo <> | Subject | Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees | Date | Fri, 17 Jul 2020 15:05:34 +0300 |
| |
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
| |