diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 23:39:26 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-05-29 23:39:26 +0300 |
| commit | 75574f1212a7b4833367ad56626c30e64a94aa18 (patch) | |
| tree | 097600a1b5cbd07b29ed5986ccd90a51c65559dc /arch | |
| parent | 6ff64d2537f5b445177c30a2fc7779a6f2107ed5 (diff) | |
| parent | b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e (diff) | |
| download | linux-75574f1212a7b4833367ad56626c30e64a94aa18.tar.xz | |
Merge tag 'block-5.7-2020-05-29' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"Two small fixes:
- Revert a block change that mixed up the return values for non-mq
devices
- NVMe poll race fix"
* tag 'block-5.7-2020-05-29' of git://git.kernel.dk/linux-block:
Revert "block: end bio with BLK_STS_AGAIN in case of non-mq devs and REQ_NOWAIT"
nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions