projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab27815 21acdf4)
Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 00:57:32 +0000 (16:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Jan 2018 00:57:32 +0000 (16:57 -0800)
Pull ceph fixes from Ilya Dryomov:
 "Two rbd fixes for 4.12 and 4.2 issues respectively, marked for
  stable"

* tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client:
  rbd: set max_segments to USHRT_MAX
  rbd: reacquire lock should update lock owner client id


Trivial merge
John Crispins staging tree