diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-03 21:47:08 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-03 21:47:08 +0300 |
commit | 143d28dcf23837a7e4c6a09e8ab369fdda81c0e7 (patch) | |
tree | c4f82f4d2232aaa2f1d331bd08dae505f02683de /fs/ext4/inline.c | |
parent | ec955023967cf9d8669c0bf62fc13aeea002ef9e (diff) | |
parent | e369edbb0d8cee50efa6375d5c598a04b7cb3032 (diff) | |
download | linux-143d28dcf23837a7e4c6a09e8ab369fdda81c0e7.tar.xz |
Merge tag 'block-5.13-2021-06-03' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"NVMe fixes from Christoph:
- Fix corruption in RDMA in-capsule SGLs (Sagi Grimberg)
- nvme-loop reset fixes (Hannes Reinecke)
- nvmet fix for freeing unallocated p2pmem (Max Gurtovoy)"
* tag 'block-5.13-2021-06-03' of git://git.kernel.dk/linux-block:
nvmet: fix freeing unallocated p2pmem
nvme-loop: do not warn for deleted controllers during reset
nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue()
nvme-loop: clear NVME_LOOP_Q_LIVE when nvme_loop_configure_admin_queue() fails
nvme-loop: reset queue count to 1 in nvme_loop_destroy_io_queues()
nvme-rdma: fix in-casule data send for chained sgls
Diffstat (limited to 'fs/ext4/inline.c')
0 files changed, 0 insertions, 0 deletions