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

[Linus Torvalds]

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.

                      Linus
--
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/