Re: linux-next: build failure after merge of the sound tree (Was:Re: linux-next: build failure after merge of the sound-asoc tree)

[Mark Brown]

On Tue, Dec 28, 2010 at 02:16:57AM +1100, Stephen Rothwell wrote:
> On Sun, 26 Dec 2010 23:59:29 +0000 Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote:

> > Hrm?  I thought you merged the ASoC tree before the sound tree, in which
> > case the above is somehwat surprising.  If the ASoC tree merged OK then
> > Takashi it should be a simple case of pulling my for-2.6.38 branch to
> > resolve the issue.

> I started merging the sound-asoc tree *after* the sound tree when the
> sound-asoc tree started to be merged into the sound tree.

That hasn't changed - ASoC has always been ahead of the sound tree and
merged into Linus' tree via the sound tree.  The frequency of merges has
increased.
--
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/