| commit | 8e64a7331702b7888ccf84b2b9ff46ab8e167c7f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 17 12:32:40 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 17 12:32:40 2015 -0700 |
| tree | be794f8219470e0e982d935f3e21a6012a685451 | |
| parent | 2e5735f4c377377cb738270024083f74ee058877 [diff] | |
| parent | 335c25858218e76ef47f92ecb9d22e919d36140d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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