Re: Q: Clarification about extra option ..Re: [Xen-devel] Re: [PATCH] pvops: Make suspend work when CONFIG_SUSPEND=n

[Shriram Rajagopalan <rshriram@xxxxxxxxx>]

On Mon, Mar 7, 2011 at 9:53 AM, Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx> wrote:

On Mon, Mar 07, 2011 at 08:33:25AM -0800, Shriram Rajagopalan wrote:
> On Mon, Mar 7, 2011 at 4:44 AM, Stefano Stabellini <
> stefano.stabellini@xxxxxxxxxxxxx> wrote:
>
> > On Sun, 6 Mar 2011, Rafael J. Wysocki wrote:
> > > > The only issue is that I cannot completely "test" these two patches
> > > > against Rafael's tree
> > > >  - I have verified that the kernel config file generated is as
> > expected.
> > > >  - I cannot verify any other xen save/restore functionality as my xen
> > > >    suspend freeze-thaw patches dont apply cleanly on Rafael's tree
> > > >   (it does not have xen suspend refactoring patches
> > > >   ceb180294790c8a6a437533488616f6b591b49d0, that my patches depend on.
> > > >   They are present only in Stefano's tree).
> > >
> > > In that case, I'm afraid, it's better to wait until both trees are merged
> > > and push your patches at that time.

<nods> But we need to review/test/etc his patches before the merge window..

> >
> > I agree even if it probably means loosing the next merge window.
> >
> > I believe the original intention of the freeze-thaw patches was to fix the
> bug that caused
> Guest VM hangs, while taking a checkpoint.
>
> Anyway, is there any chance of pushing these patches into the pvops tree
> atleast?
> I can rebase them to pvops.

so Shriram could create a branch that has both Stefano's (and also Ian's patches)
and Rafeal's tree and you can use that. And when the merge window happens
we would let Stefano's and Rafeal's tree go in and after that ask Linus to pull
this complicated tree.

That means you are going to have to create this hybrid tree. You can create a git branch
from Stefano's tree, merge in Rafael's tree, and test it (baremetal and also Xen).
Once you are satisfied that it works and it is bug-free:

 a). send the tar ball to me (or just a link).

I can do either. I can also post a link to my git tree, if that would make your life easier (in terms
of merging, etc).

 b). I am going to extract that branch in my tree
 c). You are going to post the patches that you had to develop so we can review
    them.

Just to confirm, I should post these patches against my *hybrid* tree because neither
Stefano's nor Rafael's tree are suitable. :(.

 d). If everybody is happy and testing on our test-beds is OK, I can push this tree
    later in the merge window cycle.

so, when people test these patches, they would test it against your tree ? (which would then
have incorporated my changes).

It is a bit of dance but it ought to work out?

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