Al Viro 237dae8890 Merge branch 'iocb' into for-davem ...

trivial conflict in net/socket.c and non-trivial one in crypto -
that one had evaded aio_complete() removal.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2015-04-09 00:01:38 -04:00

..

acl.c

ceph: acl: Remove unused function

2015-02-19 13:31:38 +03:00

addr.c

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

2015-02-19 14:14:42 -08:00

cache.c

ceph: fscache: Wait for completion of object initialization

2014-04-03 10:33:53 +08:00

cache.h

ceph: fscache: add an interface to synchronize object store limit

2014-04-03 10:33:53 +08:00

caps.c

ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps)

2015-02-19 13:31:38 +03:00

ceph_frag.c

ceph: factor out libceph from Ceph file system

2010-10-20 15:37:28 -07:00

debugfs.c

assorted conversions to %p[dD]

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

dir.c

Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2015-02-22 17:42:14 -08:00

export.c

ceph: ceph_get_parent() can be static

2014-06-06 09:29:50 +08:00

file.c

Merge branch 'iocb' into for-davem

2015-04-09 00:01:38 -04:00

inode.c

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

2015-02-19 14:14:42 -08:00

ioctl.c

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

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

ioctl.h

ceph: fully initialize new layout

2012-05-16 14:28:27 -05:00

Kconfig

ceph: add acl for cephfs

2013-12-31 20:32:01 +02:00

locks.c

Revert "locks: keep a count of locks on the flctx lists"

2015-02-16 14:32:03 -05:00

Makefile

ceph: add acl for cephfs

2013-12-31 20:32:01 +02:00

mds_client.c

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

2015-02-19 14:14:42 -08:00

mds_client.h

ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions)

2015-02-19 13:31:38 +03:00

mdsmap.c

fs/ceph: replace pr_warning by pr_warn

2014-06-06 16:08:06 -07:00

snap.c

ceph: improve reference tracking for snaprealm

2015-02-19 13:31:38 +03:00

strings.c

ceph: add get_name() NFS export callback

2014-04-03 10:33:53 +08:00

super.c

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

2015-02-19 14:14:42 -08:00

super.h

ceph: provide seperate {inode,file}_operations for snapdir

2015-02-19 13:31:39 +03:00

xattr.c

ceph: fix setting empty extended attribute

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