Merge tag 'for-7.2/block-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull block updates from Jens Axboe:

 - NVMe pull request via Keith:
     - Per-controller admin and IO timeout sysfs attributes, and
       letting the block layer set request timeouts (Maurizio,
       Maximilian)
     - Multipath passthrough iostats, and PCI P2PDMA enablement for
       multipath devices (Keith, Kiran)
     - A new diag sysfs attribute group exporting per-controller
       counters (retries, multipath failover, error counters, requeue
       and failure counts, reset and reconnect events) (Nilay)
     - FDP configuration validation and bounds check fixes (liuxixin)
     - Various nvmet fixes, including a pre-auth out-of-bounds read in
       the Discovery Get Log Page handler, auth payload bounds
       validation, and tcp error-path leak fixes (Bryam, Tianchu,
       Geliang)
     - nvme-tcp lockdep and workqueue fixes (Shin'ichiro, Kuniyuki,
       Eric)
     - Assorted other fixes and cleanups (John, Yao, Chao, Mateusz,
       Achkinazi, Wentao)

 - MD pull request via Yu Kuai:
     - raid1/raid10 fixes for a deadlock in the read error recovery
       path, error-path detection and bio accounting with cloned bios,
       and an nr_pending leak in the REQ_ATOMIC bad-block error path
       (Abd-Alrhman)
     - PCI P2PDMA propagation from member devices to the RAID device
       (Kiran)
     - dm-raid bio requeue fix, and various smaller fixes and cleanups
       (Benjamin, Chen, Li, Thorsten)

 - Enable Clang lock context analysis for the block layer, with the
   accompanying annotations across queue limits, the blk_holder_ops
   callbacks, crypto, cgroup, iocost, kyber and mq-deadline (Bart)

 - Block status code infrastructure work: a tagged status table, a
   str_to_blk_op() helper, a bio_endio_status() helper, and on top of
   that a new configurable block-layer error injection facility
   (Christoph)

 - DRBD netlink rework, replacing the genl_magic machinery with explicit
   netlink serialization and moving the DRBD UAPI headers to
   include/uapi/linux/ (Christoph Böhmwalder)

 - bvec improvements: a bvec_folio() helper and making the bvec_iter
   helpers proper inline functions (Willy, Christoph)

 - ublk cleanups and a canceling-flag fix for the disk-not-allocated
   case (Caleb, Ming)

 - Partition handling fixes: bound the AIX pp_count scan, fix an of_node
   refcount leak, and replace __get_free_page() with kmalloc() (Bryam,
   Wentao, Mike)

 - Convert numa_node to int in blk_mq_hw_ctx and ->init_request, and add
   WQ_PERCPU to the block workqueue users (Mateusz, Marco)

 - Block statistics and tracing: propagate in-flight to the whole disk
   on partition IO, export passthrough stats, and a new
   block_rq_tag_wait tracepoint (Tang, Keith, Aaron)

 - A round of removals, unexports and cleanups across bio, direct-io and
   the bvec helpers (Christoph)

 - Various driver fixes (mtip32xx use-after-free, rbd snap_count
   validation and strscpy conversion, nbd socket lockdep reclassify,
   virtio-blk zone report clamp, floppy) and a batch of MAINTAINERS
   email/list updates (Coly, Li, Yu, Christoph Böhmwalder)

 - Other little fixes and cleanups all over

* tag 'for-7.2/block-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: (117 commits)
  MAINTAINERS: Update Coly Li's email address
  block: check bio split for unaligned bvec
  nbd: Reclassify sockets to avoid lockdep circular dependency
  block: add configurable error injection
  block: add a str_to_blk_op helper
  block: add a "tag" for block status codes
  block: add a macro to initialize the status table
  floppy: Drop unused pnp driver data
  block: propagate in_flight to whole disk on partition I/O
  virtio-blk: clamp zone report to the report buffer capacity
  block: optimize I/O merge hot path with unlikely() hints
  drivers/block/rbd: Use strscpy() to copy strings into arrays
  partitions: aix: bound the pp_count scan to the ppe array
  block: Enable lock context analysis
  block/mq-deadline: Make the lock context annotations compatible with Clang
  block/Kyber: Make the lock context annotations compatible with Clang
  block/blk-mq-debugfs: Improve lock context annotations
  block/blk-iocost: Inline iocg_lock() and iocg_unlock()
  block/blk-iocost: Split ioc_rqos_throttle()
  block/crypto: Annotate the crypto functions
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc block/bio.c
Simple merge

diff --cc block/blk-cgroup.c
Simple merge

diff --cc block/blk-crypto-fallback.c
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc block/blk-zoned.c
Simple merge

diff --cc drivers/block/rbd.c
Simple merge

diff --cc drivers/block/ublk_drv.c
Simple merge

diff --cc drivers/mmc/core/queue.c
Simple merge

diff --cc drivers/nvme/host/apple.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc drivers/nvme/host/ioctl.c
Simple merge

diff --cc drivers/nvme/host/pci.c
Simple merge

diff --cc drivers/nvme/host/tcp.c
Simple merge

diff --cc drivers/nvme/target/tcp.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc include/linux/bio.h
index 8300d5565e36459e6ce8bfc1af7e942e83c44d81,26ebfff93a16dbab83ce2bfc3cff7e1f8dbd9072..8f33f717b14f5b9b52f06b90cb8ae7a872543031
--- 1/include/linux/bio.h
--- 2/include/linux/bio.h
+++ b/include/linux/bio.h
@@@ -475,21 -484,13 +484,14 @@@ void __bio_release_pages(struct bio *bi
  extern void bio_set_pages_dirty(struct bio *bio);
  extern void bio_check_pages_dirty(struct bio *bio);
  
 -int bio_iov_iter_bounce(struct bio *bio, struct iov_iter *iter, size_t maxlen);
 +int bio_iov_iter_bounce(struct bio *bio, struct iov_iter *iter, size_t maxlen,
 +              size_t minsize);
  void bio_iov_iter_unbounce(struct bio *bio, bool is_error, bool mark_dirty);
  
- extern void bio_copy_data_iter(struct bio *dst, struct bvec_iter *dst_iter,
-                              struct bio *src, struct bvec_iter *src_iter);
  extern void bio_copy_data(struct bio *dst, struct bio *src);
  extern void bio_free_pages(struct bio *bio);
+ void zero_fill_bio(struct bio *bio);
  void guard_bio_eod(struct bio *bio);
- void zero_fill_bio_iter(struct bio *bio, struct bvec_iter iter);
- 
- static inline void zero_fill_bio(struct bio *bio)
- {
-       zero_fill_bio_iter(bio, bio->bi_iter);
- }
  
  static inline void bio_release_pages(struct bio *bio, bool mark_dirty)
  {

diff --cc io_uring/rsrc.c
Simple merge