| commit | 1545dec46db3858bbce84c2065b579e2925706ab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 11 16:57:32 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 11 16:57:32 2018 -0800 |
| tree | 3b515a27bc0da314d2c79469171d70f9299d0956 | |
| parent | ab2781592a223510da6b19069a2ab8ba0e3ef2f5 [diff] | |
| parent | 21acdf45f4958135940f0b4767185cf911d4b010 [diff] |
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