projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a58b9ad 5ea5c5e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:31:13 +0000 (11:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Mar 2016 19:31:13 +0000 (11:31 -0800)
commit21b27a74ec0f4e52e001912c89570a49494705a2
treec9f1bc13a14ad1bd41739e12b92d9510d5b6e6e5tree | snapshot
parenta58b9adaf9f0913af2e5bf69565266335033b4fdcommit | diff
parent5ea5c5e0a7f70b256417d3b6e36bd9851504babdcommit | diff
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
John Crispins staging tree