Merge pull request #50341 from yangdongsheng/ubbd

author Ilya Dryomov <idryomov@gmail.com>

Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)

committer GitHub <noreply@github.com>

Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)
author Ilya Dryomov <idryomov@gmail.com>
Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)
committer GitHub <noreply@github.com>
Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc doc/man/8/rbd.rst
Simple merge
author	Ilya Dryomov <idryomov@gmail.com>
	Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)
committer	GitHub <noreply@github.com>
	Mon, 5 Jun 2023 21:12:28 +0000 (23:12 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
doc/man/8/rbd.rst	patch \|	diff1 \|	diff2 \|	blob \| history