diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-01-21 05:40:34 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-01-21 05:40:34 -0700 |
| commit | 1df35bf0b4e17322ec67e88b86ba21a17f904069 (patch) | |
| tree | 0eff7c3011cea932f75c897665058fcb63259d69 /drivers/net/can/dev.c | |
| parent | 8dfe11681758b5c23618233e664d3a5ac417a3ed (diff) | |
| parent | fa0732168fa1369dd089e5b06d6158a68229f7b7 (diff) | |
| download | linux-1df35bf0b4e17322ec67e88b86ba21a17f904069.tar.bz2 | |
Merge tag 'nvme-5.11-2020-01-21' of git://git.infradead.org/nvme into block-5.11
Pull NVMe fixes from Christoph:
"nvme fixes for 5.11:
- fix a status code in nvmet (Chaitanya Kulkarni)
- avoid double completions in nvme-rdma/nvme-tcp (Chao Leng)
- fix the CMB support to cope with NVMe 1.4 controllers (Klaus Jensen)
- fix PRINFO handling in the passthrough ioctl (Revanth Rajashekar)
- fix a double DMA unmap in nvme-pci"
* tag 'nvme-5.11-2020-01-21' of git://git.infradead.org/nvme:
nvme-pci: fix error unwind in nvme_map_data
nvme-pci: refactor nvme_unmap_data
nvmet: set right status on error in id-ns handler
nvme-pci: allow use of cmb on v1.4 controllers
nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
nvme: check the PRINFO bit before deciding the host buffer length
Diffstat (limited to 'drivers/net/can/dev.c')
0 files changed, 0 insertions, 0 deletions