Re: linux-next: manual merge of the block tree with Linus' tree

[Jens Axboe]

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 <sfr@xxxxxxxxxxxxxxxx> 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/