From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk•pl>
Cc: linux-next@vger•kernel.org, Rusty Russell <rusty@rustcorp•com.au>,
Mike Travis <travis@sgi•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the suspend tree with the cpus4096 tree
Date: Mon, 16 Mar 2009 20:00:05 +1100 [thread overview]
Message-ID: <20090316200005.2a98d95b.sfr@canb.auug.org.au> (raw)
Hi Rafael,
Today's linux-next merge of the suspend tree got a conflict in
drivers/xen/manage.c between commit
f7df8ed164996cd2c6aca9674388be6ef78d8b37 ("cpumask: convert misc driver
functions") from the cpus4096 tree and commit
73263bc09332c5c8de7c60cb76b5b24e2da66b42 ("PM: Rework handling of
interrupts during suspend-resume") from the suspend tree.
I fixed it up (see below) and can carry the fix as necessary. As you
said, it is trivial.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/xen/manage.c
index 3ccd348,2f1d082..0000000
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@@ -108,7 -101,13 +101,13 @@@ static void do_suspend(void
/* XXX use normal device tree? */
xenbus_suspend();
+ err = device_power_down(PMSG_SUSPEND);
+ if (err) {
+ printk(KERN_ERR "device_power_down failed: %d\n", err);
+ goto resume_devices;
+ }
+
- err = stop_machine(xen_suspend, &cancelled, &cpumask_of_cpu(0));
+ err = stop_machine(xen_suspend, &cancelled, cpumask_of(0));
if (err) {
printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
goto out;
next reply other threads:[~2009-03-16 9:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-16 9:00 Stephen Rothwell [this message]
2009-03-16 22:09 ` linux-next: manual merge of the suspend tree with the cpus4096 tree 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=20090316200005.2a98d95b.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rjw@sisk$(echo .)pl \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=tglx@linutronix$(echo .)de \
--cc=travis@sgi$(echo .)com \
/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