From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 May 2014 20:38:51 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=30625569031641eba1cd1f71148cf188500861a2;p=linux.git

Merge branch 'for-linus' of git://git./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
---

30625569031641eba1cd1f71148cf188500861a2