From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Apr 2018 19:48:17 +0000 (-0700)
Subject: Merge tag 'ceph-for-4.17-rc2' of git://github.com/ceph/ceph-client
X-Git-Tag: v4.17-rc2~30
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=87ef12027b9b1dd0e0b12cf311fbcb19f9d92539;p=linux.git

Merge tag 'ceph-for-4.17-rc2' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "A couple of follow-up patches for -rc1 changes in rbd, support for a
  timeout on waiting for the acquisition of exclusive lock and a fix for
  uninitialized memory access in CephFS, marked for stable"

* tag 'ceph-for-4.17-rc2' of git://github.com/ceph/ceph-client:
  rbd: notrim map option
  rbd: adjust queue limits for "fancy" striping
  rbd: avoid Wreturn-type warnings
  ceph: always update atime/mtime/ctime for new inode
  rbd: support timeout in rbd_wait_state_locked()
  rbd: refactor rbd_wait_state_locked()
---

87ef12027b9b1dd0e0b12cf311fbcb19f9d92539