diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 17:57:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 17:57:31 (GMT) |
| commit | c8924234bd9c06fe86bae648c472d56cb10640a5 (patch) | |
| tree | b7ecba9e5fd1f7c451f00fc52a98c321153cc522 /arch | |
| parent | 410fc4ce8a373a3c35c73ac2c7c29f2bac6400bf (diff) | |
| parent | f0666b1ac875ff32fe290219b150ec62eebbe10e (diff) | |
| download | linux-fsl-qoriq-c8924234bd9c06fe86bae648c472d56cb10640a5.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two ceph fixes from Sage Weil:
"The first patch fixes up the old crufty open intent code to use the
atomic_open stuff properly, and the second fixes a possible null deref
and memory leak with the crypto keys."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
libceph: fix crypto key null deref, memory leak
ceph: simplify+fix atomic_open
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions