]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb39cbd 70b16db)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Dec 2015 20:46:07 +0000 (12:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Dec 2015 20:46:07 +0000 (12:46 -0800)
commit849ee3d46a7334e950fb17d1ac2cbe2c6b088f65
tree454f08ff92b2767c22ff2eacbc895fb23ff17b2etree | snapshot
parentfb39cbda147082a2e7dc4e2b5f3298448295e3c4commit | diff
parent70b16db86f564977df074072143284aec2cb1162commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This addresses a refcounting bug that leads to a use-after-free"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: don't put snap_context twice in rbd_queue_workfn()
Michael's Linux tree.