From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
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: Wed, 8 Feb 2012 10:52:28 +1100 [thread overview]
Message-ID: <20120208105228.a3b2ceeaba1a63e5df9dfbbc@canb.auug.org.au> (raw)
In-Reply-To: <20120203105123.GB3151@opensource.wolfsonmicro.com>
[-- Attachment #1: Type: text/plain, Size: 612 bytes --]
Hi Mark,
On Fri, 3 Feb 2012 10:51:24 +0000 Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
>
> 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.
So, you have redone the merge (it was commit 05960268bcef and is now
6127dd802637) and still left the conflict tags in
sound/soc/codecs/wm5100.c ...
:-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-02-07 23:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-03 1:59 Stephen Rothwell
2012-02-03 10:51 ` Mark Brown
2012-02-07 23:52 ` Stephen Rothwell [this message]
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=20120208105228.a3b2ceeaba1a63e5df9dfbbc@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
/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
all inboxes | Powered by JetHome®