diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-29 16:49:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-29 16:49:25 +0100 |
| commit | 35fd3dc58da675d659513384221349ef90749a01 (patch) | |
| tree | 2ee64e48f39c0c14d454d57a8af022af9e977dd4 /drivers/media/pci/cx88/cx88-input.c | |
| parent | Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | ceph: fix dentry reference leak in encode_fh() (diff) | |
| download | linux-35fd3dc58da675d659513384221349ef90749a01.tar.xz linux-35fd3dc58da675d659513384221349ef90749a01.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes form Sage Weil:
"There are two fixes in the messenger code, one that can trigger a NULL
dereference, and one that error in refcounting (extra put). There is
also a trivial fix that in the fs client code that is triggered by NFS
reexport."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: fix dentry reference leak in encode_fh()
libceph: avoid NULL kref_put when osd reset races with alloc_msg
rbd: reset BACKOFF if unable to re-queue
Diffstat (limited to 'drivers/media/pci/cx88/cx88-input.c')
0 files changed, 0 insertions, 0 deletions