Re: linux-next: manual merge of the sound tree with Linus' tree

[Takashi Iwai]

At Fri, 8 Apr 2011 07:16:30 +0100,
Mark Brown wrote:
> 
> 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.

It'd be helpful if you can resolve in your tree.
I've been sick and can't work much since days ago.


thanks,

Takashi
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/