block: remove the unused blk_integrity_merge_rq export
authorChristoph Hellwig <hch@lst.de>
Tue, 6 Oct 2020 07:07:17 +0000 (09:07 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 6 Oct 2020 13:29:53 +0000 (07:29 -0600)
commit92cf2fd156b273879198bb1d7e58851f822c481f
tree98ade8395aca823be062425f46f7f41f022edbae
parent0549e87c30ae0d43d7e10424f2222bcd8bbe986d
block: remove the unused blk_integrity_merge_rq 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