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

[Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>]

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.



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