mbox series

[GIT,PULL] Follow-up block changes for 6.11-rc1

Message ID 505fe3f1-27bb-4791-b4c2-12c99d0da624@kernel.dk (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] Follow-up block changes for 6.11-rc1 | expand

Pull-request

git://git.kernel.dk/linux.git for-6.11/block

Message

Jens Axboe July 22, 2024, 1:57 p.m. UTC
Hi Linus,

Set of updates for the block side that weren't ready by the time I had
to close up the initial 6.11-rc pull request, due to being away on
vacation. This pull request contains:

- MD fixes via Song
	- md-cluster fixes (Heming Zhao)
	- raid1 fix (Mateusz Jończyk)

- s390/dasd module description (Jeff) 

- Series cleaning up and hardening the blk-mq debugfs flag handling
  (John, Christoph)

- blk-cgroup cleanup (Xiu)

- Error polled IO attempts if backend doesn't support it (hexue)

- Fix for an sbitmap hang (Yang)

Please pull!


The following changes since commit 3c1743a685b19bc17cf65af4a2eb149fd3b15c50:

  floppy: add missing MODULE_DESCRIPTION() macro (2024-07-10 00:22:03 -0600)

are available in the Git repository at:

  git://git.kernel.dk/linux.git for-6.11/block

for you to fetch changes up to 89ed6c9ac69ec398ccb648f5f675b43e8ca679ca:

  blk-cgroup: move congestion_count to struct blkcg (2024-07-19 09:40:07 -0600)

----------------------------------------------------------------
Carlos López (1):
      s390/dasd: fix error checks in dasd_copy_pair_store()

Christoph Hellwig (1):
      block: remove QUEUE_FLAG_STOPPED

Heming Zhao (2):
      md-cluster: fix hanging issue while a new disk adding
      md-cluster: fix no recovery job when adding/re-adding a disk

Jeff Johnson (1):
      s390/dasd: add missing MODULE_DESCRIPTION() macros

Jens Axboe (1):
      Merge tag 'md-6.11-20240712' of git://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-6.11/block

John Garry (14):
      block: Add missing entries from cmd_flag_name[]
      block: Add zone write plugging entry to rqf_name[]
      block: Add missing entry to hctx_flag_name[]
      block: Relocate BLK_MQ_CPU_WORK_BATCH
      block: Relocate BLK_MQ_MAX_DEPTH
      block: Make QUEUE_FLAG_x as an enum
      block: Catch possible entries missing from blk_queue_flag_name[]
      block: Catch possible entries missing from hctx_state_name[]
      block: Catch possible entries missing from hctx_flag_name[]
      block: Catch possible entries missing from alloc_policy_name[]
      block: Catch possible entries missing from cmd_flag_name[]
      block: Use enum to define RQF_x bit indexes
      block: Simplify definition of RQF_NAME()
      block: Catch possible entries missing from rqf_name[]

Mateusz Jończyk (1):
      md/raid1: set max_sectors during early return from choose_slow_rdev()

Xiu Jianfeng (1):
      blk-cgroup: move congestion_count to struct blkcg

Yang Yang (1):
      sbitmap: fix io hung due to race on sbitmap_word::cleared

hexue (1):
      block: avoid polling configuration errors

 block/blk-cgroup.c               |   7 ++-
 block/blk-cgroup.h               |  10 +--
 block/blk-core.c                 |   5 +-
 block/blk-mq-debugfs.c           |  26 ++++++--
 block/blk-mq.h                   |   2 +
 drivers/md/md-cluster.c          |  49 ++++++++++++---
 drivers/md/md-cluster.h          |   2 +
 drivers/md/md.c                  |  17 +++++-
 drivers/md/raid1.c               |   1 +
 drivers/s390/block/dasd_devmap.c |  10 ++-
 drivers/s390/block/dasd_diag.c   |   1 +
 drivers/s390/block/dasd_eckd.c   |   1 +
 drivers/s390/block/dasd_fba.c    |   1 +
 include/linux/blk-mq.h           | 127 ++++++++++++++++++++++++---------------
 include/linux/blk_types.h        |   1 +
 include/linux/blkdev.h           |  31 +++++-----
 include/linux/cgroup-defs.h      |   3 -
 include/linux/sbitmap.h          |   5 ++
 lib/sbitmap.c                    |  36 ++++++++---
 19 files changed, 233 insertions(+), 102 deletions(-)

Comments

Linus Torvalds July 22, 2024, 6:33 p.m. UTC | #1
On Mon, 22 Jul 2024 at 06:57, Jens Axboe <axboe@kernel.dk> wrote:
>
>   git://git.kernel.dk/linux.git for-6.11/block

This is not a signed tag.

You actually meant tags/for-6.11/block-20240722

I've pulled that, but please check your workflow and correct whatever
went wrong here,

              Linus
Jens Axboe July 22, 2024, 6:35 p.m. UTC | #2
On 7/22/24 12:33 PM, Linus Torvalds wrote:
> On Mon, 22 Jul 2024 at 06:57, Jens Axboe <axboe@kernel.dk> wrote:
>>
>>   git://git.kernel.dk/linux.git for-6.11/block
> 
> This is not a signed tag.
> 
> You actually meant tags/for-6.11/block-20240722

Gah sorry, yes that's the right tag.
> I've pulled that, but please check your workflow and correct whatever
> went wrong here,

Thanks. Looks like I inadvertently used the branch instead of the tag
for the script :/
pr-tracker-bot@kernel.org July 22, 2024, 8:45 p.m. UTC | #3
The pull request you sent on Mon, 22 Jul 2024 07:57:07 -0600:

> git://git.kernel.dk/linux.git for-6.11/block

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7d080fa867092c1db078dd72d70cb256642f7b18

Thank you!