On Thu, 2012-03-22 at 11:32 +0200, Artem Bityutskiy wrote: > 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! Thanks Again, loks right to me too. Yes i had a pending series which I applied just before I went for weekend. -- ~Vinod -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html