]> www.infradead.org Git - users/hch/block.git/commitdiff
Merge branch 'for-5.18/block' into for-next
authorJens Axboe <axboe@kernel.dk>
Sun, 27 Feb 2022 21:50:25 +0000 (14:50 -0700)
committerJens Axboe <axboe@kernel.dk>
Sun, 27 Feb 2022 21:50:25 +0000 (14:50 -0700)
* for-5.18/block: (81 commits)
  block: default BLOCK_LEGACY_AUTOLOAD to y
  block: update io_ticks when io hang
  block, bfq: don't move oom_bfqq
  block, bfq: avoid moving bfqq to it's parent bfqg
  block, bfq: cleanup bfq_bfqq_to_bfqg()
  block/bfq_wf2q: correct weight to ioprio
  blk-mq: avoid extending delays of active hctx from blk_mq_delay_run_hw_queues
  virtio_blk: simplify refcounting
  memstick/mspro_block: simplify refcounting
  memstick/mspro_block: fix handling of read-only devices
  memstick/ms_block: simplify refcounting
  block: add a ->free_disk method
  block: revert 4f1e9630afe6 ("blk-throtl: optimize IOPS throttle for large IO scenarios")
  block: don't try to throttle split bio if iops limit isn't set
  block: throttle split bio in case of iops limit
  block: merge submit_bio_checks() into submit_bio_noacct
  block: don't check bio in blk_throtl_dispatch_work_fn
  block: don't declare submit_bio_checks in local header
  block: move blk_crypto_bio_prep() out of blk-mq.c
  block: move submit_bio_checks() into submit_bio_noacct
  ...

17 files changed:
1  2 
MAINTAINERS
block/bfq-iosched.c
block/bio-integrity.c
block/blk-core.c
block/blk-mq.c
block/elevator.c
block/fops.c
block/genhd.c
drivers/block/mtip32xx/mtip32xx.c
drivers/char/random.c
drivers/md/dm.c
drivers/md/md.c
fs/erofs/zdata.c
fs/iomap/buffered-io.c
include/linux/blkdev.h
kernel/sched/core.c
security/integrity/ima/ima_policy.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc block/blk-mq.c
Simple merge
Simple merge
diff --cc block/fops.c
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
diff --cc drivers/md/dm.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge