Merge pull request #22761 from poettering/pcr-fix

author Lennart Poettering <lennart@poettering.net>

Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)

committer GitHub <noreply@github.com>

Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)
author Lennart Poettering <lennart@poettering.net>
Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)
committer GitHub <noreply@github.com>
Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)
diff --cc NEWS
Simple merge
diff --cc man/systemd-cryptenroll.xml
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)
committer	GitHub <noreply@github.com>
	Wed, 16 Mar 2022 21:32:43 +0000 (22:32 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd-cryptenroll.xml	patch \|	diff1 \|	diff2 \|	blob \| history