block: remove the unused blk_integrity_merge_bio export
authorChristoph Hellwig <hch@lst.de>
Tue, 6 Oct 2020 07:07:18 +0000 (09:07 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 6 Oct 2020 13:29:53 +0000 (07:29 -0600)
commitd59da41998bc794441d7c039a059ed6eb0c2dc4d
tree0fb13916c406c26af056e917b10923628768b0fe
parent92cf2fd156b273879198bb1d7e58851f822c481f
block: remove the unused blk_integrity_merge_bio export

Also move the definition from the public blkdev.h to the private
block/blk.h header.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-integrity.c
block/blk.h
include/linux/blkdev.h