From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jens Axboe Subject: Re: linux-next: manual merge of the block tree with Linus' tree Date: Thu, 25 Jun 2009 09:42:41 +0200 Message-ID: <20090625074241.GD31415@kernel.dk> References: <20090625131517.d9adc935.sfr@canb.auug.org.au> <20090625133005.9f521529.sfr@canb.auug.org.au> <20090625063806.GC31415@kernel.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from brick.kernel.dk ([93.163.65.50]:48961 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754311AbZFYHmi (ORCPT ); Thu, 25 Jun 2009 03:42:38 -0400 Content-Disposition: inline In-Reply-To: <20090625063806.GC31415@kernel.dk> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Alasdair G Kergon , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Al Viro On Thu, Jun 25 2009, Jens Axboe wrote: > On Thu, Jun 25 2009, Stephen Rothwell wrote: > > On Thu, 25 Jun 2009 13:15:17 +1000 Stephen Rothwell wrote: > > > > > > I can't see how to easily fix this up, so I have dropped the block tree > > > for today (since it only contained 2.6.32 material, right?). > > > > I also dropped the device-mapper tree for today as it was based on the > > block tree (and dragged in what I had just dropped) and, in any case, all > > its patches have been merged upstream. > > OK to both, I'm fixing up the writeback conflicts right now. Should be good to go again. -- Jens Axboe