From: Eric Dumazet <eric.dumazet@gmail•com>
To: David Miller <davem@davemloft•net>
Cc: sfr@canb•auug.org.au, linville@tuxdriver•com,
torvalds@linux-foundation•org, rjw@sisk•pl,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Helmut.Schaa@gmx•de, netdev@vger•kernel.org
Subject: Re: linux-next: build failure after merge of the suspend tree
Date: Fri, 21 May 2010 07:51:57 +0200 [thread overview]
Message-ID: <1274421117.4977.9.camel@edumazet-laptop> (raw)
In-Reply-To: <20100520.224644.21290162.davem@davemloft.net>
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.
next prev parent reply other threads:[~2010-05-21 5:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-07 3:08 linux-next: build failure after merge of the suspend tree Stephen Rothwell
2010-05-08 2:13 ` Rafael J. Wysocki
2010-05-21 0:29 ` Stephen Rothwell
2010-05-21 5:46 ` David Miller
2010-05-21 5:51 ` Eric Dumazet [this message]
2010-05-21 5:56 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2011-01-31 4:07 Stephen Rothwell
2011-01-31 10:12 ` Rafael J. Wysocki
2011-05-05 2:11 Stephen Rothwell
2011-05-05 20:02 ` Rafael J. Wysocki
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=1274421117.4977.9.camel@edumazet-laptop \
--to=eric.dumazet@gmail$(echo .)com \
--cc=Helmut.Schaa@gmx$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rjw@sisk$(echo .)pl \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox