From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: Re: 2.6.39 merge window (git pulls and what is
	planned to go in)
Date: Wed, 16 Mar 2011 12:21:04 -0400
Message-ID: <20110316162104.GA18604@dumpdata.com>
References: <AANLkTi=sEJexxiapPbkW7j4a08xkyx=iwRVdbxgGpZkQ@mail.gmail.com>
	<1300218769.15812.8.camel@localhost.localdomain>
	<AANLkTi=e+M5jcdjVMmLXnuOPB9aS2rTjt66jo_Yba8SJ@mail.gmail.com>
	<1300222727.15812.13.camel@localhost.localdomain>
	<20110315221610.GA10785@dumpdata.com>
	<1300268423.17339.2390.camel@zakaz.uk.xensource.com>
	<20110316142947.GA6394@dumpdata.com>
	<1300286299.13026.41.camel@zakaz.uk.xensource.com>
	<20110316155841.GA18081@dumpdata.com>
	<1300291694.13026.44.camel@zakaz.uk.xensource.com>
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: <1300291694.13026.44.camel@zakaz.uk.xensource.com>
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: Ian Campbell <Ian.Campbell@eu.citrix.com>
Cc: "rshriram@cs.ubc.ca" <rshriram@cs.ubc.ca>, Jeremy Fitzhardinge <jeremy@goop.org>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Daniel De Graaf <dgdegra@tycho.nsa.gov>, Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Wed, Mar 16, 2011 at 04:08:14PM +0000, Ian Campbell wrote:
> On Wed, 2011-03-16 at 15:58 +0000, Konrad Rzeszutek Wilk wrote:
> > > > 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.
> > 
> > I get this rejection:
> [...]
> 
> Did you take 1/5? 2/5 needs it.

Yes. I created a new branch based off linus/master, and did git am -s < ~/save

 cat ~/save | grep Message
Message-Id: <1299906435-30927-1-git-send-email-rshriram@cs.ubc.ca>
Message-Id: <1299906420-30885-1-git-send-email-rshriram@cs.ubc.ca>
konrad@phenom:~/work/linux$ cat ~/save | grep Subject:
Subject: [Xen-devel] [PATCH v3 2/5] xen: use freeze/restore/thaw PM events
Subject: [Xen-devel] [PATCH v3 1/5] xen: xenbus PM events support

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