Merge pull request #35546 from agayev/zoned-fm

author Kefu Chai <kchai@redhat.com>

Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)

committer GitHub <noreply@github.com>

Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)
author Kefu Chai <kchai@redhat.com>
Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)
committer GitHub <noreply@github.com>
Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)
committer	GitHub <noreply@github.com>
	Mon, 6 Jul 2020 12:42:48 +0000 (20:42 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history