From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: Q: Clarification about extra option ..Re: Re:
	[PATCH] pvops: Make suspend work when CONFIG_SUSPEND=n
Date: Mon, 7 Mar 2011 12:39:42 -0500
Message-ID: <20110307173942.GB4930@dumpdata.com>
References: <AANLkTikcbVEXdRsS1WYCNTinuYLcmiJ1dz2ReS18_A+3@mail.gmail.com>
	<201103042107.55975.rjw@sisk.pl>
	<AANLkTine64a2=uvx==jcgJY3ssOshGjm64OVXT4m9E=r@mail.gmail.com>
	<201103062312.07555.rjw@sisk.pl>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
In-Reply-To: <201103062312.07555.rjw@sisk.pl>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Jeremy Fitzhardinge <Jeremy.Fitzhardinge@citrix.com>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, Frank Pan <frankpzh@gmail.com>, Ian Campbell <Ian.Campbell@eu.citrix.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, rshriram@cs.ubc.ca
List-Id: xen-devel@lists.xenproject.org

> > 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.