projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6aba74f 4b2a58a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Mar 2011 16:46:09 +0000 (09:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Mar 2011 16:46:09 +0000 (09:46 -0700)
commit50f3515828024582402044bcced6804c070c491c
treef9cf25bee56d0ca54acf4d571536268774dc56edtree | snapshot
parent6aba74f2791287ec407e0f92487a725a25908067commit | diff
parent4b2a58abd1e17c0ee53c8dded879e015917cca67commit | diff
Merge git://git./linux/kernel/git/sage/ceph-client

* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: Create a new key type "ceph".
  libceph: Get secret from the kernel keys api when mounting with key=NAME.
  ceph: Move secret key parsing earlier.
  libceph: fix null dereference when unregistering linger requests
  ceph: unlock on error in ceph_osdc_start_request()
  ceph: fix possible NULL pointer dereference
  ceph: flush msgr_wq during mds_client shutdown
Unnamed repository; edit this file 'description' to name the repository.