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

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

> > Is it okay if I send out both the HIBERNATION_INTERFACE patch and
> > the XEN_SAVE_RESTORE kconfig fixes against Rafael's tree?

Do they apply cleanly against's Rafael's tree?
> > 
> > Rafael's tree on git.kernel.org and Stefano tree on
> > http://xenbits.xen.org/gitweb/ are out of sync (on linux-next branch,
> > 2.6.38-rc6).
> > I am referring to files arch/x86/xen/Kconfig and kernel/power/Kconfig that
> > would be touched by these two patches.
> > 
> > Rafael's commit 5b56bff0f50bc1ed643c2ae85e803d17fc0a110e
> > "PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME)"
> > touches both these files and this commit is not present in stefano's tree.
> > 
> > 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).

You could create a git tree where you merge Stefano's and Rafael's tree and
test on top of that.