Re: linux-next: manual merge of the slave-dma tree with the arm-soc tree

[Simon Horman]

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 commit c078c62a7528 ("mmc: sh_mobile_sdhi: remove
> sh_mobile_sdhi_info v2") from the slave-dma tree.
> 
> I fixed it up (the former removed the file, so I did that) and can
> carry the fix as necessary (no action is required).

Thanks Stephen,

my understanding is that the plan is to correct the file in Vinod's tree
even thought it is removed in mine. Your fix is correct from my point of view.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/