]> 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>
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)
commita9c9b52ad8ef4cb84b46d3d07cef2ad0e0065804
tree538719bb3395752dc1e1feba2bca94ee49c3a50e
parent827a4ab68c76a6b56f1d3c6f90c60dbff3d1cf49
parent8812eed3f9b1fd033af52c0ccd969be9869a5b0c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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