| commit | 75574f1212a7b4833367ad56626c30e64a94aa18 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 13:39:26 2020 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 29 13:39:26 2020 -0700 |
| tree | 097600a1b5cbd07b29ed5986ccd90a51c65559dc | |
| parent | 6ff64d2537f5b445177c30a2fc7779a6f2107ed5 [diff] | |
| parent | b0beb28097fa04177b3769f4bb7a0d0d9c4ae76e [diff] |
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()