]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Jul 2024 18:04:09 +0000 (11:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Jul 2024 18:04:09 +0000 (11:04 -0700)
Pull block integrity mapping updates from Jens Axboe:
 "A set of cleanups and fixes for the block integrity support.

  Sent separately from the main block changes from last week, as they
  depended on later fixes in the 6.10-rc cycle"

* tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux:
  block: don't free the integrity payload in bio_integrity_unmap_free_user
  block: don't free submitter owned integrity payload on I/O completion
  block: call bio_integrity_unmap_free_user from blk_rq_unmap_user
  block: don't call bio_uninit from bio_endio
  block: also return bio_integrity_payload * from stubs
  block: split integrity support out of bio.h

1  2 
block/bio-integrity.c
block/bio.c
block/blk.h
drivers/md/dm.c
drivers/scsi/sd.c

Simple merge
diff --cc block/bio.c
Simple merge
diff --cc block/blk.h
Simple merge
diff --cc drivers/md/dm.c
Simple merge
Simple merge