* linux-next: manual merge of the suspend tree with the cpus4096 tree
@ 2009-03-16 9:00 Stephen Rothwell
2009-03-16 22:09 ` Rafael J. Wysocki
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-03-16 9:00 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: linux-next, Rusty Russell, Mike Travis, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin
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;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the suspend tree with the cpus4096 tree
2009-03-16 9:00 linux-next: manual merge of the suspend tree with the cpus4096 tree Stephen Rothwell
@ 2009-03-16 22:09 ` Rafael J. Wysocki
0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2009-03-16 22:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Rusty Russell, Mike Travis, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin
On Monday 16 March 2009, Stephen Rothwell wrote:
> Hi Rafael,
Hi,
> 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.
Please do, if that's not a problem.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-16 22:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-16 9:00 linux-next: manual merge of the suspend tree with the cpus4096 tree Stephen Rothwell
2009-03-16 22:09 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox