Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go in)

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

> > 2/5 depends on Rafael tree so will have to wait until that gets merged in.
> > But we can definitly push those two (1/5 and 2/5) right when Rafael's tree
> > has been merged.
> 
> Does it? Why?
> 
> If it's just the minor conflict in arch/x86/xen/Kconfig I say throw it
> in and let it get resolved at merge time.

I get this rejection:
konrad@phenom:~/work/linux$ cat drivers/xen/xenbus/xenbus_probe_frontend.c.rej
--- drivers/xen/xenbus/xenbus_probe_frontend.c
+++ drivers/xen/xenbus/xenbus_probe_frontend.c
@@ -86,9 +86,11 @@
 };
 
 static const struct dev_pm_ops xenbus_pm_ops = {
-       .suspend = xenbus_dev_suspend,
-       .resume  = xenbus_dev_resume,
-       .thaw  = xenbus_dev_cancel,
+       .suspend        = xenbus_dev_suspend,
+       .resume         = xenbus_dev_resume,
+       .freeze         = xenbus_dev_suspend,
+       .thaw           = xenbus_dev_cancel,
+       .restore        = xenbus_dev_resume,
 };
 
 static struct xen_bus_type xenbus_frontend = {


Which we could just omit this, but later we would still have to come up
with another patch to make up for this (I think, haven't loked in detail at
'restore' codepath in the PM core).

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel