linux-kernel - Re: linux-next: manual merge of the vfs 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: <20120109132246.d1b8bb0dc4c16b04d9a326ea@canb.auug.org.au>
Date:	Mon, 9 Jan 2012 13:22:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Al Viro <viro@...iv.linux.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Chris Mason <chris.mason@...cle.com>
Subject: Re: linux-next: manual merge of the vfs tree with Linus' tree

On Sun, 8 Jan 2012 17:32:14 -0800 Linus Torvalds <torvalds@...ux-foundation.org> wrote:
>
> On Sun, Jan 8, 2012 at 5:11 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Then again ... it looks like the vfs tree has other changes to the btrfs
> > code so that I need the version from the vfs tree, not Linus' tree ...
> 
> The btrfs changes (at lest most of them) will come through the btrfs
> tree, that's one of the reasons the vfs tree got re-built, afaik.

That's fine, but maybe we should consider getting the btrfs tree into
linux-next ...

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped