From: Vinod Koul <vinod.koul@linux.intel.com>
To: dedekind1@gmail.com
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexandre Bounine <alexandre.bounine@idt.com>,
Huang Shijie <b32955@freescale.com>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the slave-dma tree
Date: Mon, 26 Mar 2012 11:48:47 +0530 [thread overview]
Message-ID: <1332742727.19804.20.camel@vkoul-udesk3> (raw)
In-Reply-To: <1332408753.18717.1.camel@sauron.fi.intel.com>
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
next prev parent reply other threads:[~2012-03-26 6:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 3:04 linux-next: manual merge of the l2-mtd tree with the slave-dma tree Stephen Rothwell
2012-03-22 9:32 ` Artem Bityutskiy
2012-03-26 6:18 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-22 2:53 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332742727.19804.20.camel@vkoul-udesk3 \
--to=vinod.koul@linux.intel.com \
--cc=alexandre.bounine@idt.com \
--cc=b32955@freescale.com \
--cc=dedekind1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox