Linus Torvalds 44e8967d59 Ceph: remove left-over reject file ...

Neither Sage nor I noticed that Zheng Yan had mistakenly committed
fs/ceph/super.h.rej as part of commit 31c542a199d7 ("ceph: add inline
data to pagecache").

Remove it.

Requested-by: Yan, Zheng <ukernel@gmail.com>
Cc: Sage Weil <sweil@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2014-12-17 18:47:01 -08:00

..

acl.c

ceph: include the initial ACL in create/mkdir/mknod MDS requests

2014-10-14 12:56:49 -07:00

addr.c

ceph: do_sync is never initialized

2014-12-17 20:09:53 +03:00

cache.c

…

cache.h

…

caps.c

ceph: flush inline version

2014-12-17 20:09:53 +03:00

ceph_frag.c

…

debugfs.c

assorted conversions to %p[dD]

2014-11-19 13:01:20 -05:00

dir.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2014-12-17 16:03:12 -08:00

export.c

…

file.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2014-12-17 16:03:12 -08:00

inode.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2014-12-17 16:03:12 -08:00

ioctl.c

ceph: fix divide-by-zero in __validate_layout()

2014-10-14 12:57:05 -07:00

ioctl.h

…

Kconfig

…

locks.c

ceph: fix file lock interruption

2014-12-17 20:09:49 +03:00

Makefile

…

mds_client.c

ceph: parse inline data in MClientReply and MClientCaps

2014-12-17 20:09:52 +03:00

mds_client.h

ceph: use getattr request to fetch inline data

2014-12-17 20:09:52 +03:00

mdsmap.c

…

snap.c

ceph: flush inline version

2014-12-17 20:09:53 +03:00

strings.c

…

super.c

ceph: support inline data feature

2014-12-17 20:09:53 +03:00

super.h

ceph: flush inline version

2014-12-17 20:09:53 +03:00

xattr.c

ceph: fix setting empty extended attribute

2014-12-17 20:18:49 +03:00