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@xxxxxxxxxxxxxxxx
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
