From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 20 Jun 2024 12:54:53 +0000 (-0600)
Subject: Merge branch 'for-6.11/block-limits' into for-6.11/block
X-Git-Tag: v6.11-rc1~80^2~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e821bcecdf82c7293322df15d8172ff274f84ef4;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-6.11/block-limits' into for-6.11/block

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
---

e821bcecdf82c7293322df15d8172ff274f84ef4