]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:00:27 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Mar 2014 22:00:27 +0000 (15:00 -0700)
commita839fcb4aae865342f9fa220776b1d58d4c5d879
tree57afca1fa00e0c21697e3acdcccd7ed7c544ef77
parent84da9af1eea9806184a044319146cd03300f87a8
parent047887a1464572b35cc7bf0551d0c17a50440312
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This drops a bad assert that a few users have been hitting but we've
  only recently been able to track down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: drop an unsafe assertion