diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-18 12:48:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-18 12:48:17 -0700 |
commit | 87ef12027b9b1dd0e0b12cf311fbcb19f9d92539 (patch) | |
tree | 4b095184609664dfe3be84883845792debb507b4 /crypto/drbg.c | |
parent | a27fc14219f2e3c4a46ba9177b04d9b52c875532 (diff) | |
parent | d93605407af34eb0b7eb8aff6b1eae2cde3cdd22 (diff) | |
download | linux-87ef12027b9b1dd0e0b12cf311fbcb19f9d92539.tar.gz linux-87ef12027b9b1dd0e0b12cf311fbcb19f9d92539.tar.bz2 linux-87ef12027b9b1dd0e0b12cf311fbcb19f9d92539.zip |
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()
Diffstat (limited to 'crypto/drbg.c')
0 files changed, 0 insertions, 0 deletions