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: Shriram Rajagopalan <rshriram@xxxxxxxxx>
Date: Wed, 16 Mar 2011 08:28:42 -0700
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>, "rshriram@xxxxxxxxx" <rshriram@xxxxxxxxx>, Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
Delivery-date: Wed, 16 Mar 2011 08:29:24 -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: <20110310192946.GA9175@xxxxxxxxxxxx> <1299834691.17339.1797.camel@xxxxxxxxxxxxxxxxxxxxxx> <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
On 2011-03-16, at 7:38 AM, Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx> wrote:

> On Wed, 2011-03-16 at 14:29 +0000, Konrad Rzeszutek Wilk wrote:
>>> 1/5 xen: xenbus PM events support
>>>        Can go in now via a Xen tree. No brainer.
>>> 2/5 xen: use freeze/restore/thaw PM events for suspend/resume/chkpt
>>>        Can go in now via a Xen tree. Contains a real bugfix and doesn't
>>>        make the Kconfig situation any worse. Should probably have
>>>        s/CONFIG_XEN_SAVE_RESTORE/CONFIG_HIBERNATION/ done to it for the
>>>        time being (see 5/5).
>> ..snip..
>>> Basically 1/5..2/5 and 3/5..5/5 are two separate series and 1/5..2/5 can
>>> go in now...
>> 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.
> Ian.
I don't think 2/5 depends on Rafael's tree. 5/5 does, which could either follow 
Rafael's tree or let merge conflict resolve the issue. 2/5 is the bug fix, 5/5 
is the icing
Xen-devel mailing list

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