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

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 writes: > >> Today's linux-next merge of the dmaengine tree got a conflict in: >> >>MAINTAINERS >> >> between commit: >> >>

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

Stephen Rothwell 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

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

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