From: Vinod Koul <vinod.koul@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexandre Bounine <alexandre.bounine@idt.com>,
Lars-Peter Clausen <lars@metafoo.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the slave-dma tree with the sound tree
Date: Mon, 26 Mar 2012 11:47:35 +0530 [thread overview]
Message-ID: <1332742655.19804.19.camel@vkoul-udesk3> (raw)
In-Reply-To: <20120322134101.e2342db0ae13a4ed79cfebfd@canb.auug.org.au>
On Thu, 2012-03-22 at 13:41 +1100, Stephen Rothwell wrote:
> On Thu, 22 Mar 2012 13:39:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the slave-dma tree got a conflict in
> > sound/soc/imx/imx-pcm-dma-mx2.c between commit c307e8e32e11 ("ASoC:
> > imx-pcm-dma: Use dmaengine PCM helper functions") from the sound tree and
> > commit 16052827d98f ("dmaengine/dma_slave: introduce inline wrappers")
> > from the slave-dma tree.
> >
> > I just use dthe version from the sound tree.
>
> The same with sound/soc/mxs/mxs-pcm.c .
Thanks Stephan, and sorry for delay in responding was away for the
weekend.
This should be fixed now with MArk applying the fix from Fabio Estevam.
I see this is in asoc-next.
--
~Vinod
next prev parent reply other threads:[~2012-03-26 6:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 2:39 linux-next: manual merge of the slave-dma tree with the sound tree Stephen Rothwell
2012-03-22 2:41 ` Stephen Rothwell
2012-03-26 6:17 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-22 2:34 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=1332742655.19804.19.camel@vkoul-udesk3 \
--to=vinod.koul@linux.intel.com \
--cc=alexandre.bounine@idt.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/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