| commit | 0f2776e6151a123552fd06b666fe755fa780a967 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 29 15:00:27 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 29 15:00:27 2014 -0700 |
| tree | 57afca1fa00e0c21697e3acdcccd7ed7c544ef77 | |
| parent | 49d8137a4039c63c834827f4bfe875e27bb9c521 [diff] | |
| parent | 638c323c4d1f8eaf25224946e21ce8818f1bcee1 [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