On Fri, May 23, 2014 at 03:23:10PM +1000, Stephen Rothwell wrote:
> Hi Chris,
>
> Today's linux-next merge of the mmc tree got a conflict in
> include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
> hide filter_fn for built-in drivers") from the slave-dma tree and
> commit ee526d
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
hide filter_fn for built-in drivers") from the slave-dma tree and
commit ee526d515ad1 ("mmc: omap_hsmmc: split omap-dma header file")
from the mmc tree.
I f
Hi Chris,
Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sh_mmcif.c between commits 916001fe33b7 ("mmc: sh_mmcif:
remove unneeded struct sh_mmcif_dma, prepare to shdma conversion") and
0e79f9ae1610 ("mmc: sh_mmcif: switch to the new DMA channel allocation
and configura
3 matches
Mail list logo
