Hi Linus, Some general fixes, and a bit of late stragglers that missed -rc1 and really should have been there. Nothing major, though. In detail: - NVMe pull request from Sagi: - nvme completion rework from Christoph and Chao that mostly came from a bit of divergence of how we classify errors related to pathing/retry etc. - nvmet passthru fixes from Chaitanya - minor nvmet fixes from Amit and I - mpath round-robin path selection fix from Martin - ignore noiob for zoned devices from Keith - minor nvme-fc fix from Tianjia" - Deprecate /dev/raw*, we've been using O_DIRECT on the block device for almost two decades at this point (Christoph). - BFQ cgroup leak fix (Dmitry) - Block layer MAINTAINERS addition (Geert) - Cleanup rpm_status non-enum status (Geert) - Fix null_blk FUA checking (Hou) - get_max_io_size() size fix (Keith) - Fix block page_is_mergeable() for compound pages (Matthew) - Discard granularity fixes (Ming) - IO scheduler ordering fix (Ming) - Misc fixes Please pull! The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: git://git.kernel.dk/linux-block.git tags/block-5.9-2020-08-21 for you to fetch changes up to 2113d4f63da33fb960c4e276101a06c1a06c6e5e: virtio-blk: Use kobj_to_dev() instead of container_of() (2020-08-21 08:44:51 -0600) ---------------------------------------------------------------- block-5.9-2020-08-21 ---------------------------------------------------------------- Amit Engel (1): nvmet: Disable keep-alive timer when kato is cleared to 0h Chaitanya Kulkarni (3): nvmet: add ns tear down label for pt-cmd handling nvmet: fix oops in pt cmd execution nvmet: call blk_mq_free_request() directly Chao Leng (1): nvme: redirect commands on dying queue Christoph Hellwig (5): raw: deprecate the raw driver nvme-pci: fix PRP pool size nvme: rename and document nvme_end_request nvme: refactor command completion nvme: just check the status code type in nvme_is_path_error Dmitry Monakhov (1): bfq: fix blkio cgroup leakage v4 Geert Uytterhoeven (2): MAINTAINERS: Add missing header files to BLOCK LAYER section block: Make request_queue.rpm_status an enum Hou Pu (1): null_blk: fix passing of REQ_FUA flag in null_handle_rq Jens Axboe (1): Merge branch 'nvme-5.9-rc' of git://git.infradead.org/nvme into block-5.9 John Garry (1): nvme-pci: Use u32 for nvme_dev.q_depth and nvme_queue.q_depth Keith Busch (2): block: fix get_max_io_size() nvme: skip noiob for zoned devices Logan Gunthorpe (2): nvmet-passthru: Reject commands with non-sgl flags set nvme: Use spin_lock_irq() when taking the ctrl->lock Martin Wilck (2): nvme: multipath: round-robin: fix single non-optimized path case nvme: multipath: round-robin: eliminate "fallback" variable Matthew Wilcox (Oracle) (1): block: Fix page_is_mergeable() for compound pages Miaohe Lin (1): block: Convert to use the preferred fallthrough macro Ming Lei (5): blk-mq: order adding requests to hctx->dispatch and checking SCHED_RESTART block: loop: set discard granularity and alignment for block device backed loop block: respect queue limit of max discard segment block: virtio_blk: fix handling single range discard request blk-mq: insert request not through ->queue_rq into sw/scheduler queue Nathan Chancellor (1): block/rnbd: Ensure err is always initialized in process_rdma Randy Dunlap (1): block: blk-mq.c: fix @at_head kernel-doc warning Sagi Grimberg (1): nvmet: fix a memory leak Tian Tao (1): virtio-blk: Use kobj_to_dev() instead of container_of() Tianjia Zhang (1): nvme-fc: Fix wrong return value in __nvme_fc_init_request() Xu Wang (1): bsg-lib: convert comma to semicolon Yufen Yu (1): blkcg: fix memleak for iolatency .../fault-injection/nvme-fault-injection.rst | 2 +- MAINTAINERS | 1 + block/badblocks.c | 2 +- block/bfq-cgroup.c | 2 +- block/bfq-iosched.c | 4 +- block/bfq-iosched.h | 1 - block/bfq-wf2q.c | 12 +-- block/bio.c | 10 +-- block/blk-cgroup.c | 8 +- block/blk-merge.c | 13 +++- block/blk-mq-sched.c | 9 +++ block/blk-mq.c | 13 +++- block/blk-wbt.c | 2 +- block/bsg-lib.c | 2 +- block/ioprio.c | 2 +- drivers/block/loop.c | 33 +++++---- drivers/block/null_blk_main.c | 2 +- drivers/block/rnbd/rnbd-srv.c | 3 +- drivers/block/virtio_blk.c | 33 ++++++--- drivers/char/raw.c | 5 ++ drivers/nvme/host/core.c | 86 ++++++++++++++-------- drivers/nvme/host/fc.c | 6 +- drivers/nvme/host/multipath.c | 69 +++++++---------- drivers/nvme/host/nvme.h | 31 +++++++- drivers/nvme/host/pci.c | 17 +++-- drivers/nvme/host/rdma.c | 2 +- drivers/nvme/host/tcp.c | 4 +- drivers/nvme/target/configfs.c | 1 + drivers/nvme/target/core.c | 6 ++ drivers/nvme/target/loop.c | 2 +- drivers/nvme/target/passthru.c | 25 +++++-- include/linux/blkdev.h | 3 +- 32 files changed, 251 insertions(+), 160 deletions(-) -- Jens Axboe