From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Aug 2015 18:09:07 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v4.2-rc6~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e884479bf5041fc511b06a173cdcdf41984071c;p=thirdparty%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "There are two critical regression fixes for CephFS from Zheng, and an
  RBD completion fix for layered images from Ilya"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fix copyup completion race
  ceph: always re-send cap flushes when MDS recovers
  ceph: fix ceph_encode_locks_to_buffer()
---

7e884479bf5041fc511b06a173cdcdf41984071c