]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2011 18:43:22 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Mar 2011 18:43:22 +0000 (10:43 -0800)
commite0bd7a54dbec57a99834fac1616ffba83a6f21b7
treeef8760123f5a2b692126ecb7a70f2689053885c1
parent432a5a3cfc5662d54496eb5340e91523347a785b
parente61810e06ecca5c2dc1505d05f8cb460100730f5
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"