Hi Linus,
Some followup fixes and changes for the block area that should go into
the 6.12-rc1 release. This pull request contains:
- Series from Keith improving blk-integrity segment counting and merging
- NVMe pull request via Keith
- Multipath fixes (Hannes)
- Sysfs attribute list NULL terminate fix (Shin'ichiro)
- Remove problematic read-back (Keith)
- Fix for a regression with the IO scheduler switching freezing from
6.11 (Damien)
- Use a raw spinlock for sbitmap, as it may get called from preempt
disabled context (Ming)
- Cleanup for bd_claiming waiting, using var_waitqueue() rather than the
bit waitqueues, as that more accurately describes that it does (Neil)
- Various cleanups (Kanchan, Qiu-ji, David)
Note that due to the regression fix from Damien, 6.11 was merged into
this branch as the fix would otherwise not apply.
Please pull!
The following changes since commit 98f7e32f20d28ec452afb208f9cffc08448a2652:
Linux 6.11 (2024-09-15 16:57:56 +0200)
are available in the Git repository at:
git://git.kernel.dk/linux.git tags/for-6.12/block-20240925
for you to fetch changes up to a045553362b53fb8f34bb1c3e5de5e020af79550:
Merge tag 'nvme-6.12-2024-09-25' of git://git.infradead.org/nvme into for-6.12/block (2024-09-25 03:29:17 -0600)
----------------------------------------------------------------
for-6.12/block-20240925
----------------------------------------------------------------
Damien Le Moal (1):
block: Fix elv_iosched_local_module handling of "none" scheduler
Dr. David Alan Gilbert (1):
block: Remove unused blk_limits_io_{min,opt}
Hannes Reinecke (2):
nvme-multipath: system fails to create generic nvme device
nvme-multipath: avoid hang on inaccessible namespaces
Jens Axboe (2):
Merge tag 'v6.11' into for-6.12/block
Merge tag 'nvme-6.12-2024-09-25' of git://git.infradead.org/nvme into for-6.12/block
Kanchan Joshi (1):
block: remove bogus union
Keith Busch (10):
blk-mq: unconditional nr_integrity_segments
blk-mq: set the nr_integrity_segments from bio
blk-integrity: properly account for segments
blk-integrity: consider entire bio list for merging
block: provide a request helper for user integrity segments
scsi: use request to get integrity segments
nvme-rdma: use request to get integrity segments
block: unexport blk_rq_count_integrity_sg
blk-integrity: improved sg segment mapping
nvme: remove CC register read-back during enabling
Ming Lei (1):
lib/sbitmap: define swap_lock as raw_spinlock_t
NeilBrown (1):
block: change wait on bd_claiming to use a var_waitqueue
Qiu-ji Chen (1):
drbd: Fix atomicity violation in drbd_uuid_set_bm()
Shin'ichiro Kawasaki (1):
nvme: null terminate nvme_tls_attrs
block/bdev.c | 4 ++--
block/bio-integrity.c | 1 -
block/blk-integrity.c | 36 ++++++++++++++++++++---------
block/blk-merge.c | 4 ++++
block/blk-mq.c | 5 ++--
block/blk-settings.c | 42 ----------------------------------
block/elevator.c | 4 +++-
drivers/block/drbd/drbd_main.c | 6 +++--
drivers/nvme/host/core.c | 5 ----
drivers/nvme/host/ioctl.c | 6 ++---
drivers/nvme/host/multipath.c | 14 +++++++++---
drivers/nvme/host/rdma.c | 6 ++---
drivers/nvme/host/sysfs.c | 1 +
drivers/scsi/scsi_lib.c | 12 +++-------
include/linux/blk-integrity.h | 15 ++++++++----
include/linux/blk-mq.h | 3 ---
include/linux/blk_types.h | 4 +---
include/linux/blkdev.h | 2 --
include/linux/sbitmap.h | 2 +-
lib/sbitmap.c | 4 ++--
20 files changed, 76 insertions(+), 100 deletions(-)
--
Jens Axboe
