tree ef8760123f5a2b692126ecb7a70f2689053885c1
parent 5c4b4be3b6b937256103a5ae49177e0c3a17cb8f
parent 455cec0abff563574cca432ced49f734117ca113
author Linus Torvalds <torvalds@linux-foundation.org> 1299350602 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1299350602 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: no .snap inside of snapped namespace
  libceph: fix msgr standby handling
  libceph: fix msgr keepalive flag
  libceph: fix msgr backoff
  libceph: retry after authorization failure
  libceph: fix handling of short returns from get_user_pages
  ceph: do not clear I_COMPLETE from d_release
  ceph: do not set I_COMPLETE
  Revert "ceph: keep reference to parent inode on ceph_dentry"