diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 16:20:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 16:20:05 -0700 |
| commit | 0151ef0085f946eed75da851297577f88d74c50c (patch) | |
| tree | 9ab2f69450555848a5c4d0d473f06b248e1a07c2 /crypto | |
| parent | bb236dbeea8181c6733e6d34a53bfef9c8ef4e95 (diff) | |
| parent | 42de82a8b544fa55670feef7d6f85085fba48fc0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A small set of fixes for -rc2 - two fixes for BFQ, documentation and
code, and a removal of an unused variable in nbd. Outside of that, a
small collection of fixes from the usual crew on the nvme side"
* 'for-linus' of git://git.kernel.dk/linux-block:
nvmet: don't report 0-bytes in serial number
nvmet: preserve controller serial number between reboots
nvmet: Move serial number from controller to subsystem
nvmet: prefix version configfs file with attr
nvme-pci: Fix an error handling path in 'nvme_probe()'
nvme-pci: Remove nvme_setup_prps BUG_ON
nvme-pci: add another device ID with stripe quirk
nvmet-fc: fix byte swapping in nvmet_fc_ls_create_association
nvme: fix byte swapping in the streams code
nbd: kill unused ret in recv_work
bfq: dispatch request to prevent queue stalling after the request completion
bfq: fix typos in comments about B-WF2Q+ algorithm
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions