From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: Re: 2.6.39 merge window (git pulls and what is planned to go in) Date: Fri, 11 Mar 2011 09:21:09 -0500 Message-ID: <20110311142109.GA4880@dumpdata.com> References: <20110310192946.GA9175@dumpdata.com> <1299834691.17339.1797.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <1299834691.17339.1797.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell , Shriram Rajagopalan Cc: Stefano@acsinet11.oracle.com, Jeremy Fitzhardinge , "xen-devel@lists.xensource.com" , Daniel De Graaf , Stabellini List-Id: xen-devel@lists.xenproject.org On Fri, Mar 11, 2011 at 09:11:31AM +0000, Ian Campbell wrote: > On Thu, 2011-03-10 at 19:29 +0000, Konrad Rzeszutek Wilk wrote: > > Probably over the weekend Linus is going to open the merge window. > > > > This merge window is much more complicated than the previous > > one b/c we got a lot of good stuff. > > > > For my sanity and book-keeping I was thinking to email Linus > > five git pull requests: > [...] > > .. and then during the next week of the two weeks merge window: > [...] > > In this order or so. > > Seems sane. I'm going to rebase my dev tree onto all these now (I think > I've got most of it already) OK. #linux-next is you place then. > > > In other trees by other maintainers we have: > [...] > > git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git has > > xen suspend cleanups > > PVonHVM improvements - makes spinlocks be PV aware, balloon in HVM > > Are Shriram's suspend/checkpoint patches in the pipeline somewhere? I knew I forgot something. The last I heard he was battling PVonHVM shutdown issues during his testing of his patches. Shririam? > > > The things that are not going in 2.6.39 are: > > > > devel/xen-pciback-0.4.driver [xen-pciback] > > Targeting 2.6.40? Yes. > > > devel/xen-blkback-v1 [xen-blkback] > > 2.6.40 again? Yeah, I think by that time any issues/failures would show up and I can fix them. > > > git://xenbits.xen.org/people/ianc/linux-2.6 upstream/dom0/backend/netback > > [xen-netback - well, it could if the network maintainers are comfortable > > with the driver, but I think it is still going through the review] > > I've got another round of (minor) review feedback to address, I'm still > a little bit hopeful for a 2.6.39 merge. > > Either way this will go through the net tree not us. > > Ian. > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel