WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned t

To: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Subject: Re: [Xen-devel] Re: 2.6.39 merge window (git pulls and what is planned to go in)
From: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>
Date: Wed, 16 Mar 2011 16:24:29 +0000
Cc: "rshriram@xxxxxxxxx" <rshriram@xxxxxxxxx>, Jeremy Fitzhardinge <jeremy@xxxxxxxx>, "xen-devel@xxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxx>, Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>, Stefano Stabellini <Stefano.Stabellini@xxxxxxxxxxxxx>
Delivery-date: Wed, 16 Mar 2011 09:25:04 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <20110316162104.GA18604@xxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Organization: Citrix Systems, Inc.
References: <AANLkTi=sEJexxiapPbkW7j4a08xkyx=iwRVdbxgGpZkQ@xxxxxxxxxxxxxx> <1300218769.15812.8.camel@xxxxxxxxxxxxxxxxxxxxx> <AANLkTi=e+M5jcdjVMmLXnuOPB9aS2rTjt66jo_Yba8SJ@xxxxxxxxxxxxxx> <1300222727.15812.13.camel@xxxxxxxxxxxxxxxxxxxxx> <20110315221610.GA10785@xxxxxxxxxxxx> <1300268423.17339.2390.camel@xxxxxxxxxxxxxxxxxxxxxx> <20110316142947.GA6394@xxxxxxxxxxxx> <1300286299.13026.41.camel@xxxxxxxxxxxxxxxxxxxxxx> <20110316155841.GA18081@xxxxxxxxxxxx> <1300291694.13026.44.camel@xxxxxxxxxxxxxxxxxxxxxx> <20110316162104.GA18604@xxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
On Wed, 2011-03-16 at 16:21 +0000, Konrad Rzeszutek Wilk wrote:
> 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@xxxxxxxxx>
> Message-Id: <1299906420-30885-1-git-send-email-rshriram@xxxxxxxxx>
> 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

Those subjects look backwards?

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



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

<Prev in Thread] Current Thread [Next in Thread>