]> www.infradead.org Git - nvme.git/commitdiff
Merge branch 'for-6.11/block-limits' into for-6.11/block
authorJens Axboe <axboe@kernel.dk>
Thu, 20 Jun 2024 12:54:53 +0000 (06:54 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Jun 2024 12:55:20 +0000 (06:55 -0600)
Merge in queue limits cleanups.

* for-6.11/block-limits:
  block: move the raid_partial_stripes_expensive flag into the features field
  block: remove the discard_alignment flag
  block: move the misaligned flag into the features field
  block: renumber and rename the cache disabled flag
  block: fix spelling and grammar for in writeback_cache_control.rst
  block: remove the unused blk_bounce enum

1  2 
block/blk-settings.c
drivers/md/dm-table.c
drivers/md/raid5.c
include/linux/blkdev.h

Simple merge
Simple merge
Simple merge
Simple merge