Re: linux-next: manual merge of the akpm-current tree with the fscache tree

[David Howells]

Stephen Rothwell <s...@canb.auug.org.au> wrote:

> This is now a conflict between the fscache tree and Linus' tree.

I've rebased to -rc1 and repushed.

David