projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af54efa 84fcc2d)
Merge tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2017 01:38:05 +0000 (17:38 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2017 01:38:05 +0000 (17:38 -0800)
Pull ceph fixes from Ilya Dryomov:
 "Two small fixups for the filesystem changes that went into this merge
  window"

* tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client:
  ceph: fix get_oldest_context()
  ceph: fix mds cluster availability check


Trivial merge
John Crispins staging tree