On Wed, Sep 4, 2019 at 12:44 PM Stephen Rothwell wrote:
>
> diff --cc drivers/dma/iop-adma.c
> index 03f4a588cf7f,003b753e4604..
> --- a/drivers/dma/iop-adma.c
> +++ b/drivers/dma/iop-adma.c
> @@@ -116,9 -116,9 +116,9 @@@ static void __iop_adma_slot_cleanup(str
>
Hi all,
Today's linux-next merge of the slave-dma tree got a conflict in:
drivers/dma/iop-adma.c
between commit:
00c9755524fb ("dmaengine: iop-adma: use correct printk format strings")
from the arm-soc tree and commit:
d17d9ea95727 ("dmaengine: iop-adma.c: fix printk format warning")
On Wed, Mar 18, 2015 at 12:03:47PM +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
> ("ARM: shmobile: mackerel: Remove Legacy C board code") from the
> arm-soc
On Wed, Mar 18, 2015 at 12:03:47PM +1100, Stephen Rothwell wrote:
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
(ARM: shmobile: mackerel: Remove Legacy C board code) from the
arm-soc tree and
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
("ARM: shmobile: mackerel: Remove Legacy C board code") from the
arm-soc tree and commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove
sh_mobile_sdhi_info
Hi Vinod,
Today's linux-next merge of the slave-dma tree got a conflict in
arch/arm/mach-shmobile/board-mackerel.c between commit a521422ea4ae
(ARM: shmobile: mackerel: Remove Legacy C board code) from the
arm-soc tree and commit c078c62a7528 (mmc: sh_mobile_sdhi: remove
sh_mobile_sdhi_info v2)
6 matches
Mail list logo