This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned t

To: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
Subject: Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go in)
From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Date: Wed, 16 Mar 2011 11:58:41 -0400
Cc: "rshriram@xxxxxxxxx" <rshriram@xxxxxxxxx>, Jeremy Fitzhardinge <jeremy@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>, Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
Delivery-date: Wed, 16 Mar 2011 09:02:52 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1300286299.13026.41.camel@xxxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <20110311142109.GA4880@xxxxxxxxxxxx> <1300201934.17339.2255.camel@xxxxxxxxxxxxxxxxxxxxxx> <AANLkTi=sEJexxiapPbkW7j4a08xkyx=iwRVdbxgGpZkQ@xxxxxxxxxxxxxx> <1300218769.15812.8.camel@xxxxxxxxxxxxxxxxxxxxx> <AANLkTi=e+M5jcdjVMmLXnuOPB9aS2rTjt66jo_Yba8SJ@xxxxxxxxxxxxxx> <1300222727.15812.13.camel@xxxxxxxxxxxxxxxxxxxxx> <20110315221610.GA10785@xxxxxxxxxxxx> <1300268423.17339.2390.camel@xxxxxxxxxxxxxxxxxxxxxx> <20110316142947.GA6394@xxxxxxxxxxxx> <1300286299.13026.41.camel@xxxxxxxxxxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.20 (2009-06-14)
> > 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

<Prev in Thread] Current Thread [Next in Thread>