diff options
author | 2015-09-17 12:32:40 -0700 | |
---|---|---|
committer | 2015-09-17 12:32:40 -0700 | |
commit | 8e64a7331702b7888ccf84b2b9ff46ab8e167c7f (patch) | |
tree | be794f8219470e0e982d935f3e21a6012a685451 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'for-v4.3-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply (diff) | |
parent | libceph: advertise support for keepalive2 (diff) | |
download | wireguard-linux-8e64a7331702b7888ccf84b2b9ff46ab8e167c7f.tar.xz wireguard-linux-8e64a7331702b7888ccf84b2b9ff46ab8e167c7f.zip |
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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions