]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4304e38 3bf8be8)
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)
commit52f5636c0cdd4e42b9f7dfecac0058c968aa056a
tree57afca1fa00e0c21697e3acdcccd7ed7c544ef77tree | snapshot
parent4304e38bae1c0a18586d3bb7feb7d25d460b1e7fcommit | diff
parent3bf8be8c5fb2b1d16f46408de60ff2bbd7262d3bcommit | 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 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
Linux Kernel Source Tree.