On 11-06-19, 16:32, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the slave-dma tree got a conflict in:
>
> include/linux/sudmac.h
>
> between commit:
>
> 49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX -
> rule 311")
>
> from Linus' tree and com
Hi all,
Today's linux-next merge of the slave-dma tree got a conflict in:
include/linux/sudmac.h
between commit:
49833cbeafa4 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
311")
from Linus' tree and commit:
9a0f780958bb ("dmaengine: sudmac: remove unused driver")
fr
On 26-02-19, 15:24, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in:
>
> drivers/dma/dmatest.c
>
> between commit:
>
> 6454368a804c ("dmaengine: dmatest: Abort test in case of mapping error")
>
> from Linus' tree and commit:
>
> 3
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in:
drivers/dma/dmatest.c
between commit:
6454368a804c ("dmaengine: dmatest: Abort test in case of mapping error")
from Linus' tree and commit:
361deb7243d2 ("dmaengine: dmatest: wrap src & dst data into a struct")
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in:
drivers/dma/imx-sdma.c
between commit:
750afb08ca71 ("cross-tree: phase out dma_zalloc_coherent()")
from Linus' tree and commit:
ceaf52265148 ("dmaengine: imx-sdma: pass ->dev to dma_alloc_coherent() API")
from
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
drivers/dma/dmatest.c between commit 632fd28326c0 ("dmatest: implement
two helpers to unmap dma memory") from the tree and commit f04f98e91bd8
("dmatest: adjust invalid module parameters for number of source
buffers") from
6 matches
Mail list logo
