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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20090625074241.GD31415@kernel.dk>
Date:	Thu, 25 Jun 2009 09:42:41 +0200
From:	Jens Axboe <jens.axboe@...cle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Alasdair G Kergon <agk@...hat.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Christoph Hellwig <hch@....de>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

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@...b.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.

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/