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

[Stephen Rothwell]

Hi Sage,

Today's linux-next merge of the ceph tree got a conflict in
fs/ceph/pagelist.c between commit
3d4401d9d0aef5c40706350685ddea3df6708496 ("ceph: fix pagelist kunmap
tail") from Linus' tree and commit
49dde0c8bee346a349862c4a3eddcd58e0d0ae90 ("ceph: factor out libceph from
Ceph file system") from the ceph tree.

The latter moved the file to net/ceph/pagelist.c, and the former patch
has been applied there, so I just removed the fs/ceph version of the file.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature