summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 18:46:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 18:46:09 +0200
commit50f3515828024582402044bcced6804c070c491c (patch)
treef9cf25bee56d0ca54acf4d571536268774dc56ed /security
parentMerge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentlibceph: Create a new key type "ceph". (diff)
downloadlinux-50f3515828024582402044bcced6804c070c491c.tar.xz
linux-50f3515828024582402044bcced6804c070c491c.zip
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
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions