Commit 1f47ed294a2b ("block: cleanup and fix batch completion adding conditions") in the kernel tag v6.14-rc3 triggered blktests nvme/039 failure [1]. The test case injects errors to the NVMe driver and confirms the errors are logged. The first half of the test checks it for non-passthrough requests, and the second half checks for passthrough requests. The commit made both halves fail. This series addresses the test case failure. The first patch covers the passthrough requests, and the second patch covers the non-passthrough requests. [1] https://lkml.kernel.org/linux-block/y7m5kyk5r2eboyfsfprdvhmoo27ur46pz3r2kwb4puhxjhbvt6@zgh4dg3ewya3/ Shin'ichiro Kawasaki (2): nvme: move error logging from nvme_end_req() to __nvme_end_req() block: change blk_mq_add_to_batch() third argument type to blk_status_t drivers/block/null_blk/main.c | 2 +- drivers/block/virtio_blk.c | 5 +++-- drivers/nvme/host/apple.c | 3 ++- drivers/nvme/host/core.c | 15 ++++++++------- drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/pci.c | 5 +++-- include/linux/blk-mq.h | 5 +++-- 7 files changed, 21 insertions(+), 15 deletions(-) -- 2.47.0