From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Takashi Iwai <tiwai@suse.de>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lucas De Marchi <lucas.demarchi@profusion.mobi>
Subject: Re: linux-next: manual merge of the sound tree with Linus' tree
Date: Fri, 8 Apr 2011 07:16:30 +0100 [thread overview]
Message-ID: <20110408061630.GB21700@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20110408143825.e15b444a.sfr@canb.auug.org.au>
On Fri, Apr 08, 2011 at 02:38:25PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sound tree got a conflict in
> sound/soc/codecs/wm8994.c between commit 25985edcedea ("Fix common
> misspellings") from Linus' tree and commit f701a2e594e6 ("ASoC: Factor
> WM8958 DSP2 handling into separate file") from the sound tree.
> The latter moved the code changed by the former into another file. I did
> not bother fixing the spelling errors there.
I guess I'll fix this by merging up next time there's a -rc. Not sure
why such patches aren't getting done against -next, though.
next prev parent reply other threads:[~2011-04-08 6:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-08 4:38 linux-next: manual merge of the sound tree with Linus' tree Stephen Rothwell
2011-04-08 6:16 ` Mark Brown [this message]
2011-04-10 10:00 ` Takashi Iwai
2011-04-10 18:29 ` Mark Brown
2011-04-11 9:05 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2010-04-07 3:18 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=20110408061630.GB21700@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucas.demarchi@profusion.mobi \
--cc=sfr@canb.auug.org.au \
--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.