lkml.org 
[lkml]   [2009]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the block tree with Linus' tree
On Thu, Jun 25 2009, Stephen Rothwell wrote:
> On Thu, 25 Jun 2009 13:15:17 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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.

--
Jens Axboe



\
 
 \ /
  Last update: 2009-06-25 08:41    [W:0.428 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site