Re: linux-next: build failure after merge of the suspend tree

[Eric Dumazet]

Le jeudi 20 mai 2010 Ã 22:46 -0700, David Miller a Ãcrit :
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 21 May 2010 10:29:13 +1000
> 
> > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw@xxxxxxx> wrote:
> >>
> >> On Friday 07 May 2010, Stephen Rothwell wrote:
> >> Both trees are based on Linus' current and I don't see a good way of fixing
> >> this issue in any of them individually.
> > 
> > The suspend tree has been merged into Linus' tree, so this patch is
> > needed in the net tree before it is merged (or as part of the merge).
> 
> Since the net tree is still on it's way to Linus, we'll just have to
> wait for him to do that merge.
> 
> Then we can sort this out.  I don't want to touch a tree that is
> already on it's way.

Linus merged your tree David.



--
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/