Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2013 16:27:40 +0000 (06:27 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jun 2013 16:27:40 +0000 (06:27 -1000)
commit7ecba6f2f3f6e862287e07908ba583199c7772a9
tree538719bb3395752dc1e1feba2bca94ee49c3a50e
parenta3d5c3460a86f52ea435b3fb98be112bd18faabc
parent3a96d5cd7bdce45d5dded75c3a62d4fb98050280
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This fixes a problem preventing the kernel and userland librbd
  libraries from sharing data with the new format 2 images"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use the correct length for format 2 object names
drivers/block/rbd.c