diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-19 19:50:37 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-19 19:50:37 +0200 |
| commit | e9ff04dd94d46c817bbb103531cdef6e7bd5d022 (patch) | |
| tree | f6544ac65503d04b7760492e7f2592132e4a6d6c /include/media/lirc_dev.h | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | fscache: check consistency does not decrement refcount (diff) | |
| download | linux-e9ff04dd94d46c817bbb103531cdef6e7bd5d022.tar.xz linux-e9ff04dd94d46c817bbb103531cdef6e7bd5d022.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fixes from Sage Weil:
"These fix several bugs with RBD from 3.11 that didn't get tested in
time for the merge window: some error handling, a use-after-free, and
a sequencing issue when unmapping and image races with a notify
operation.
There is also a patch fixing a problem with the new ceph + fscache
code that just went in"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
fscache: check consistency does not decrement refcount
rbd: fix error handling from rbd_snap_name()
rbd: ignore unmapped snapshots that no longer exist
rbd: fix use-after free of rbd_dev->disk
rbd: make rbd_obj_notify_ack() synchronous
rbd: complete notifies before cleaning up osd_client and rbd_dev
libceph: add function to ensure notifies are complete
Diffstat (limited to 'include/media/lirc_dev.h')
0 files changed, 0 insertions, 0 deletions