From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: 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: Thu, 20 May 2010 22:46:44 -0700 (PDT) [thread overview]
Message-ID: <20100520.224644.21290162.davem@davemloft.net> (raw)
In-Reply-To: <20100521102913.ae4e8cd2.sfr@canb.auug.org.au>
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.
Thanks Stephen.
next prev parent reply other threads:[~2010-05-21 5:46 UTC|newest]
Thread overview: 6+ 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 [this message]
2010-05-21 5:51 ` Eric Dumazet
2010-05-21 5:56 ` David Miller
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=20100520.224644.21290162.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=Helmut.Schaa@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).