lkml.org 
[lkml]   [2012]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the l2-mtd tree with the slave-dma tree
From
Date
On Thu, 2012-03-22 at 14:04 +1100, Stephen Rothwell wrote:
> Hi Artem,
>
> Today's linux-next merge of the l2-mtd tree got a conflict in
> drivers/mtd/nand/gpmi-nand/gpmi-lib.c between commit 16052827d98f
> ("dmaengine/dma_slave: introduce inline wrappers") from the slave-dma
> tree and commit c790d78c631f ("mxs-dma : rewrite the last parameter of
> mxs_dma_prep_slave_sg()") from the l2-mtd tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks like Vinod merged a lot of changes recently. Thanks for fixing
this up in linux-next!

--
Best Regards,
Artem Bityutskiy
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-03-22 10:33    [W:0.041 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site