diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-22 05:38:51 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-22 05:38:51 +0900 |
| commit | 30625569031641eba1cd1f71148cf188500861a2 (patch) | |
| tree | 9e1bc52e0c623b450724593c7b0c0e505d634cba /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge tag 'xfs-for-linus-3.15-rc6' of git://oss.sgi.com/xfs/xfs (diff) | |
| parent | crush: decode and initialize chooseleaf_vary_r (diff) | |
| download | linux-dev-30625569031641eba1cd1f71148cf188500861a2.tar.xz linux-dev-30625569031641eba1cd1f71148cf188500861a2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two ceph fixes from Sage Weil:
"The first patch fixes a problem when we have a page count of 0 for
sendpage which is triggered by zfs. The second fixes a bug in CRUSH
that was resolved in the userland code a while back but fell through
the cracks on the kernel side"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
crush: decode and initialize chooseleaf_vary_r
libceph: fix corruption when using page_count 0 page in rbd
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions