From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@ti.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Vinod Koul <vinod.koul@intel.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Lars-Peter Clausen <lars@metafoo.de>
Subject: linux-next: manual merge of the sound-asoc tree with the slave-dma tree
Date: Mon, 5 Mar 2012 13:59:49 +1100 [thread overview]
Message-ID: <20120305135949.cd08aaf15f8bfa36d35dbc98@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/imx/imx-pcm-dma-mx2.c between commit c0fa6c8af7ab ("ASoC: i.MX:
Add missing dma_async_issue_pending") from the slave-dma tree and commit
c307e8e32e11 ("ASoC: imx-pcm-dma: Use dmaengine PCM helper functions")
from the sound-asoc tree.
The latter removed the code modified by the former, so hopefully the
former change is subsumed into the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-05 3:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-05 2:59 Stephen Rothwell [this message]
2013-12-03 0:38 linux-next: manual merge of the sound-asoc tree with the slave-dma tree Stephen Rothwell
2013-12-03 16:48 ` Mark Brown
2013-12-20 2:14 Stephen Rothwell
2014-01-13 1:43 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=20120305135949.cd08aaf15f8bfa36d35dbc98@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@ti.com \
--cc=s.hauer@pengutronix.de \
--cc=vinod.koul@intel.com \
/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).