]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae34680 0b8f2ea)
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)
commit5ce816215b4b43402e7fe2057a408781b73926c7
treebe794f8219470e0e982d935f3e21a6012a685451tree | snapshot
parentae34680ffa5cbd44a7e1ba91e9d2210bbccd782bcommit | diff
parent0b8f2ea5245284825bed91a2751d53047791cee3commit | 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.