From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org, Liam Girdwood <lrg@ti.com>
Subject: Re: ASoC updates for 3.3
Date: Mon, 30 Jan 2012 14:51:58 +0000 [thread overview]
Message-ID: <20120130145158.GI4882@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <s5h62ftqn8j.wl%tiwai@suse.de>
[-- Attachment #1.1: Type: text/plain, Size: 443 bytes --]
On Mon, Jan 30, 2012 at 03:27:40PM +0100, Takashi Iwai wrote:
> But this brings merge conflicts in codecs/wm5100.c.
> If you already resolved in 3.4 branch, please give it, too.
It's resolved in my for-next branch but not in my 3.4 branch, I'd been
going to merge up an -rc when one appeared with the relevant commits.
If you want to pull my for-next into your for-next that'd solve the
issue for your -next tree which is the issue I guess?
[-- 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:[~2012-01-30 14:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 13:34 ASoC updates for 3.3 Mark Brown
2012-01-30 14:27 ` Takashi Iwai
2012-01-30 14:51 ` Mark Brown [this message]
2012-01-30 15:19 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2012-03-01 12:41 Mark Brown
2012-03-01 13:20 ` Takashi Iwai
2012-02-21 19:48 Mark Brown
2012-02-21 20:23 ` Takashi Iwai
2012-02-08 20:15 Mark Brown
2012-02-08 21:32 ` Takashi Iwai
2012-02-04 12:55 Mark Brown
2012-02-06 9:32 ` Takashi Iwai
2012-02-06 11:08 ` Mark Brown
2012-02-06 11:13 ` Takashi Iwai
2012-02-06 11:15 ` Mark Brown
2012-01-17 16:54 Mark Brown
2012-01-17 19:47 ` Takashi Iwai
2012-01-12 8:38 Mark Brown
2012-01-06 6:43 Mark Brown
2012-01-08 13:41 ` Takashi Iwai
2011-12-28 11:43 Mark Brown
2011-12-31 16:53 ` Takashi Iwai
2011-12-23 12:18 Mark Brown
2011-12-23 13:38 ` Takashi Iwai
[not found] <20111213071251.GF7148@opensource.wolfsonmicro.com>
2011-12-13 9:18 ` Takashi Iwai
2011-12-13 10:01 ` Mark Brown
2011-12-06 10:37 Mark Brown
2011-11-29 11:38 Mark Brown
2011-11-29 12:11 ` Takashi Iwai
2011-11-22 12:59 Mark Brown
2011-11-22 17:47 ` Takashi Iwai
2011-11-08 11:24 Mark Brown
2011-11-08 16:01 ` Takashi Iwai
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=20120130145158.GI4882@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=lrg@ti.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.