From: Linus Torvalds Date: Tue, 21 Sep 2010 18:20:10 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... X-Git-Tag: v2.6.36-rc6~84 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19746cad00a00a7a2e3eb0640d317d6e7c2e8cc0;p=platform%2Fkernel%2Flinux-3.10.git Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: ceph: select CRYPTO ceph: check mapping to determine if FILE_CACHE cap is used ceph: only send one flushsnap per cap_snap per mds session ceph: fix cap_snap and realm split ceph: stop sending FLUSHSNAPs when we hit a dirty capsnap ceph: correctly set 'follows' in flushsnap messages ceph: fix dn offset during readdir_prepopulate ceph: fix file offset wrapping at 4GB on 32-bit archs ceph: fix reconnect encoding for old servers ceph: fix pagelist kunmap tail ceph: fix null pointer deref on anon root dentry release --- 19746cad00a00a7a2e3eb0640d317d6e7c2e8cc0