lkml.org 
[lkml]   [2010]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: linux-next: build failure after merge of the suspend tree
    From
    Date
    Le jeudi 20 mai 2010 à 22:46 -0700, David Miller a écrit :
    > From: Stephen Rothwell <sfr@canb.auug.org.au>
    > Date: Fri, 21 May 2010 10:29:13 +1000
    >
    > > On Sat, 8 May 2010 04:13:24 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> 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@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-05-21 07:55    [W:0.022 / U:59.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site