Merge branch 'for-5.11/block' into for-5.11/block-merged for-5.11/block-merged
authorJens Axboe <axboe@kernel.dk>
Mon, 14 Dec 2020 15:05:26 +0000 (08:05 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 14 Dec 2020 15:05:26 +0000 (08:05 -0700)
commit7134fdd950f21ab265ac22e83bf21d874396e047
tree934eb0d5200540558eb2a377c44b78eb0a73096e
parent2c85ebc57b3e1817b6ce1a6b703928e113a90442
parentfa94ba8a7b22890e6a17b39b9359e114fe18cd59
Merge branch 'for-5.11/block' into for-5.11/block-merged

* for-5.11/block: (126 commits)
  blk-mq: fix msec comment from micro to milli seconds
  blk-mq: update arg in comment of blk_mq_map_queue
  blk-mq: add helper allocating tagset->tags
  Revert "block: Fix a lockdep complaint triggered by request queue flushing"
  nvme-loop: use blk_mq_hctx_set_fq_lock_class to set loop's lock class
  blk-mq: add new API of blk_mq_hctx_set_fq_lock_class
  block: disable iopoll for split bio
  block: Improve blk_revalidate_disk_zones() checks
  sbitmap: simplify wrap check
  sbitmap: replace CAS with atomic and
  sbitmap: remove swap_lock
  sbitmap: optimise sbitmap_deferred_clear()
  blk-mq: skip hybrid polling if iopoll doesn't spin
  blk-iocost: Factor out the base vrate change into a separate function
  blk-iocost: Factor out the active iocgs' state check into a separate function
  blk-iocost: Move the usage ratio calculation to the correct place
  blk-iocost: Remove unnecessary advance declaration
  blk-iocost: Fix some typos in comments
  blktrace: fix up a kerneldoc comment
  block: remove the request_queue to argument request based tracepoints
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
16 files changed:
block/blk-flush.c
block/blk-merge.c
drivers/block/xen-blkback/common.h
drivers/md/dm-raid.c
drivers/md/dm-table.c
drivers/md/dm.c
drivers/md/md.c
drivers/md/raid0.c
drivers/md/raid10.c
drivers/nvme/host/core.c
drivers/s390/block/dasd.c
fs/btrfs/volumes.c
fs/ext4/super.c
fs/io_uring.c
include/linux/blkdev.h
mm/filemap.c