lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 26 Mar 2012 11:48:47 +0530 From: Vinod Koul <vinod.koul@...ux.intel.com> To: dedekind1@...il.com Cc: Stephen Rothwell <sfr@...b.auug.org.au>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Alexandre Bounine <alexandre.bounine@....com>, Huang Shijie <b32955@...escale.com> Subject: Re: linux-next: manual merge of the l2-mtd tree with the slave-dma tree 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-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists