Messages in this thread | | | Date | Wed, 18 Mar 2015 12:03:47 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the slave-dma tree with the arm-soc tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |