lkml.org 
[lkml]   [2015]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the slave-dma tree with the renesas tree
On Wed, Mar 18, 2015 at 12:03:22PM +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-ape6evm.c between commit 9d07d414d4c3
> ("ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform") from the
> renesas 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 for reporting,

Yes the fix is the right one.

--
~Vinod

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-03-18 12:41    [W:0.027 / U:0.252 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site