From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the sound-asoc tree
Date: Fri, 3 Feb 2012 10:51:24 +0000 [thread overview]
Message-ID: <20120203105123.GB3151@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120203125902.558e273c84b339957869f281@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
On Fri, Feb 03, 2012 at 12:59:02PM +1100, Stephen Rothwell wrote:
> I fixed it up (I think - see below) and can carry the fix as necessary.
That's the correct fix, thanks. I'll resolve this in my tree once
Linus' tree has merged the conflicting stuff.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-02-03 10:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 1:59 linux-next: manual merge of the sound-asoc tree Stephen Rothwell
2012-02-03 10:51 ` Mark Brown [this message]
2012-02-07 23:52 ` Stephen Rothwell
2012-02-08 11:25 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2011-06-16 2:40 Stephen Rothwell
2011-06-16 10:12 ` Mark Brown
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=20120203105123.GB3151@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=sfr@canb.auug.org.au \
/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.