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

From: Stephen Rothwell
Date: Sun Jan 08 2012 - 21:22:55 EST


On Sun, 8 Jan 2012 17:32:14 -0800 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> On Sun, Jan 8, 2012 at 5:11 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature