Skip to contentSkip to conversation

Block fixes for 5.15-rc1

GIT PULL Merged Jens Axboe 2 participants 2 messages Sep 6, 2021 Block layer

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

Hi Linus,

Was going to send this one in later this week, but given that -Werror is now enabled (or at least available), the mq-deadline fix really should go in for the folks hitting that.

- Ensure dd_queued() is only there if needed (Geert)

- Fix a kerneldoc warning for bio_alloc_kiocb()

- BFQ fix for queue merging

- loop locking fix (Tetsuo)

Please pull!

The following changes since commit 4ac6d90867a4de2e12117e755dbd76e08d88697f:

Merge tag 'docs-5.15' of git://git.lwn.net/linux (2021-09-01 18:49:47 -0700)

are available in the Git repository at:

git://git.kernel.dk/linux-block.git tags/block-5.15-2021-09-05

for you to fetch changes up to 1c500ad706383f1a6609e63d0b5d1723fd84dab9:

loop: reduce the loop_ctl_mutex scope (2021-09-03 22:14:40 -0600)

----------------------------------------------------------------
block-5.15-2021-09-05

----------------------------------------------------------------
Geert Uytterhoeven (1):
block/mq-deadline: Move dd_queued() to fix defined but not used warning

Jens Axboe (1):
bio: fix kerneldoc documentation for bio_alloc_kiocb()

Paolo Valente (1):
block, bfq: honor already-setup queue merges

Tetsuo Handa (1):
loop: reduce the loop_ctl_mutex scope

 block/bfq-iosched.c  | 16 ++++++++---
 block/bio.c          |  2 +-
 block/mq-deadline.c  | 12 ++++-----
 drivers/block/loop.c | 75 ++++++++++++++++++++++++++++++++++------------------
 drivers/block/loop.h |  1 +
 5 files changed, 70 insertions(+), 36 deletions(-)
Signature · 1 line
Jens Axboe