From: Mark Brown <broonie@kernel.org>
To: Stephen Warren <swarren@wwwdotorg.org>
Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>,
Stephen Warren <swarren@nvidia.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [PATCH 1/5] ASoC: ep93xx: get rid of ep93xx-pcm-audio struct device
Date: Tue, 10 Dec 2013 11:57:16 +0000 [thread overview]
Message-ID: <20131210115716.GH29268@sirena.org.uk> (raw)
In-Reply-To: <52A6573E.1000504@wwwdotorg.org>
[-- Attachment #1.1: Type: text/plain, Size: 798 bytes --]
On Mon, Dec 09, 2013 at 04:50:22PM -0700, Stephen Warren wrote:
> On 12/09/2013 01:44 PM, Lars-Peter Clausen wrote:
> > This will have a conflict with the "ASoC: ep93xx: Use
> > devm_snd_dmaengine_pcm_register()" patch from the topic/ep93xx branch.
> That's true. The conflict isn't conceptually that hard to resolve, but
> probably a lot more than you want to do in a merge. I guess the way to
> resolve it is to merge topic/ep93xx and topic/spear into topic/dma, then
> to apply these patches on top. If that sounds good, I can rebase them
> and resend.
Please always submit against -next or at least check that that's going
to work and comment on the result, it makes life easier. Remember that
all the topic branches are constantly merged together, it's important
that that works smoothly.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
next prev parent reply other threads:[~2013-12-10 11:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 20:24 [PATCH 0/5] ASoC: remove dmaengine compat_request_channel Stephen Warren
2013-12-09 20:24 ` [PATCH 1/5] ASoC: ep93xx: get rid of ep93xx-pcm-audio struct device Stephen Warren
2013-12-09 20:44 ` Lars-Peter Clausen
2013-12-09 23:50 ` Stephen Warren
2013-12-10 7:47 ` Lars-Peter Clausen
2013-12-10 10:23 ` Mark Brown
2013-12-10 16:56 ` Stephen Warren
2013-12-10 17:02 ` Mark Brown
2013-12-10 11:57 ` Mark Brown [this message]
2013-12-10 10:26 ` Mark Brown
2013-12-10 16:58 ` Stephen Warren
2013-12-09 20:24 ` [PATCH 2/5] ASoC: ep93xx: remove custom DMA alloc compat function Stephen Warren
2013-12-10 10:26 ` Mark Brown
2013-12-09 20:24 ` [PATCH 3/5] ASoC: SPEAr: get rid of spear-pcm-audio struct device Stephen Warren
2013-12-09 20:48 ` Lars-Peter Clausen
2013-12-09 20:24 ` [PATCH 4/5] ASoC: SPEAr: remove custom DMA alloc compat function Stephen Warren
2013-12-09 21:17 ` Lars-Peter Clausen
2013-12-10 6:30 ` Rajeev kumar
2013-12-10 7:45 ` Lars-Peter Clausen
2013-12-10 8:53 ` Rajeev kumar
2013-12-10 9:00 ` Lars-Peter Clausen
2013-12-10 11:44 ` Rajeev kumar
2013-12-09 20:24 ` [RFC PATCH 5/5] ASoC: dmaengine: remove compat_request_channel Stephen Warren
2013-12-09 20:38 ` [PATCH 0/5] ASoC: remove dmaengine compat_request_channel Lars-Peter Clausen
2013-12-10 8:21 ` Lee Jones
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=20131210115716.GH29268@sirena.org.uk \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=swarren@nvidia.com \
--cc=swarren@wwwdotorg.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).