| commit | 50f3515828024582402044bcced6804c070c491c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 30 09:46:09 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 30 09:46:09 2011 -0700 |
| tree | f9cf25bee56d0ca54acf4d571536268774dc56ed | |
| parent | 6aba74f2791287ec407e0f92487a725a25908067 [diff] | |
| parent | 4b2a58abd1e17c0ee53c8dded879e015917cca67 [diff] |
Merge git://git.kernel.org/pub/scm/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