From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Mar 2016 19:31:13 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v4.5-rc7~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=21b27a74ec0f4e52e001912c89570a49494705a2;p=linux-2.6-block.git

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

Pull ceph fix from Sage Weil:
 "This is a final commit we missed to align the protocol compatibility
  with the feature bits.

  It decodes a few extra fields in two different messages and reports
  EIO when they are used (not yet supported)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support
---

21b27a74ec0f4e52e001912c89570a49494705a2