From: Vinod Koul <vinod.koul@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Abraham <thomas.abraham@linaro.org>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the s5p tree
Date: Wed, 23 Nov 2011 16:58:41 +0530 [thread overview]
Message-ID: <1322047721.1516.261.camel@vkoul-udesk3> (raw)
In-Reply-To: <20111121110837.05684cae0be90d4e7f0df47e@canb.auug.org.au>
On Mon, 2011-11-21 at 11:08 +1100, Stephen Rothwell wrote:
> Hi Vinod,
>
> Today's linux-next merge of the slave-dma tree got a conflict in
> drivers/dma/pl330.c between commit fc0b5cccc8dd ("DMA: PL330: Infer
> transfer direction from transfer request instead of platform data") from
> the s5p tree and commit db8196df4bb6 ("dmaengine: move drivers to
> dma_transfer_direction") from the slave-dma tree.
>
> The former removed the code modified by the latter, so I did that.
Thanks Stephan,
It seems to be the right fix
--
~Vinod
next prev parent reply other threads:[~2011-11-23 11:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-21 0:08 linux-next: manual merge of the slave-dma tree with the s5p tree Stephen Rothwell
2011-11-23 11:28 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-11 1:00 Stephen Rothwell
2011-11-11 8:36 ` Thomas Abraham
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=1322047721.1516.261.camel@vkoul-udesk3 \
--to=vinod.koul@intel.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=thomas.abraham@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).