From: Linus Torvalds Date: Fri, 21 Jun 2013 16:27:40 +0000 (-1000) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ecba6f2f3f6e862287e07908ba583199c7772a9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 7ecba6f2f3f6e862287e07908ba583199c7772a9