From: Linus Torvalds Date: Thu, 17 Sep 2015 19:32:40 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... X-Git-Tag: omap-for-v4.3/fixes-rc5~120 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e64a7331702b7888ccf84b2b9ff46ab8e167c7f;p=pandora-kernel.git Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client Pull Ceph fixes from Sage Weil: "These are both fixes to the new and improved keepalive2 behavior" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: advertise support for keepalive2 libceph: don't access invalid memory in keepalive2 path --- 8e64a7331702b7888ccf84b2b9ff46ab8e167c7f Reading git-diff-tree failed