Re: Re: 2.6.39 merge window (git pulls and what is planned to go in)

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

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