From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Jan 2018 00:57:32 +0000 (-0800)
Subject: Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1545dec46db3858bbce84c2065b579e2925706ab;p=linux.git

Merge tag 'ceph-for-4.15-rc8' of git://github.com/ceph/ceph-client

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
---

1545dec46db3858bbce84c2065b579e2925706ab