]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 20:38:51 +0000 (05:38 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 May 2014 20:38:51 +0000 (05:38 +0900)
commit3044e485c46c3777b9abb23a66882390c97e0db0
tree9e1bc52e0c623b450724593c7b0c0e505d634cba
parent598be2be990fbc54a00f613cb0c4fdc409f573be
parent1cd0050a0dcb7cd50f3f954849410eb4e4428450
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