From: Linus Torvalds Date: Mon, 22 Jul 2024 18:04:09 +0000 (-0700) Subject: Merge tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux X-Git-Tag: block-6.11-20240726~10 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0256994887d7c89c2a41d872aac67605bda8f115;p=linux-2.6-block.git Merge tag 'for-6.11/block-post-20240722' of git://git.kernel.dk/linux 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 --- 0256994887d7c89c2a41d872aac67605bda8f115