]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cfee9e6 4331b0e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Sep 2015 19:32:40 +0000 (12:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Sep 2015 19:32:40 +0000 (12:32 -0700)
commit29e5604d76c946b8f2facefba47fb3c6bd9dac91
treebe794f8219470e0e982d935f3e21a6012a685451tree | snapshot
parentcfee9e6cc6d56bdee1b9a097ee09903892557e3ecommit | diff
parent4331b0eede839c18add507f13a2f67ae0dd5d4e7commit | 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
Linux Kernel Source Tree.