]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
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

1  2 
drivers/block/rbd.c

Simple merge