Merge pull request #42570 from tchaikov/wip-libcryptsetup

author Ilya Dryomov <idryomov@gmail.com>

Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)

committer GitHub <noreply@github.com>

Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)
author Ilya Dryomov <idryomov@gmail.com>
Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)
committer GitHub <noreply@github.com>
Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Ilya Dryomov <idryomov@gmail.com>
	Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)
committer	GitHub <noreply@github.com>
	Mon, 2 Aug 2021 19:35:16 +0000 (21:35 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history