From: Ingo Molnar <mingo@elte.hu>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: x86/driver-core merge failure
Date: Mon, 19 May 2008 18:35:51 +0200 [thread overview]
Message-ID: <20080519163551.GB19882@elte.hu> (raw)
In-Reply-To: <200805191623.07902.rjw@sisk.pl>
* Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Monday, 19 of May 2008, Stephen Rothwell wrote:
> > Hi Greg, Ingo,
> >
> > Today's linux-next merge of the x86 tree got a conflict in
> > kernel/power/main.c between commit
> > 7c6e17af5dfa9e70e1eb32981f3f608ef1d0eca5 ("PM: Introduce new top
> > level suspend and hibernation callbacks") from the driver-core tree
> > and commit 338e075309d960eb91cc8540f69b9cb5b2967d3e ("sleepy linux
> > self-test") from the x86 tree. The former added a parameter to
> > device_resume() while the latter put a
> > suspend_test_start()/suspend_test_finish() pair around the
> > device_resume() call in the error path of
> > suspend_devices_and_enter(). It is a trivial fixup.
>
> Okay, but I think the "sleepy linux self-test" patch should be
> updated.
do you have time to have a look? It's in the 'tip/scratch' branch of
-tip:
http://people.redhat.com/mingo/tip.git/README
commit:
| commit 338e075309d960eb91cc8540f69b9cb5b2967d3e
| Author: David Brownell <david-b@pacbell.net>
| Date: Fri May 16 10:12:36 2008 +0200
|
| sleepy linux self-test
it was included in linux-next by mistake - but while we are at it it
might make sense to make it work properly?
Ingo
next prev parent reply other threads:[~2008-05-19 16:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-19 1:33 linux-next: x86/driver-core merge failure Stephen Rothwell
2008-05-19 14:23 ` Rafael J. Wysocki
2008-05-19 16:35 ` Ingo Molnar [this message]
2008-05-19 22:37 ` 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=20080519163551.GB19882@elte.hu \
--to=mingo@elte.hu \
--cc=greg@kroah.com \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=sfr@canb.auug.org.au \
/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).