Merge pull request #31790 from poettering/pcrlock-policy-fix

author Lennart Poettering <lennart@poettering.net>

Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)

committer GitHub <noreply@github.com>

Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)
committer GitHub <noreply@github.com>
Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)
diff --cc src/pcrlock/pcrlock.c
Simple merge
diff --cc src/shared/tpm2-util.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)
committer	GitHub <noreply@github.com>
	Thu, 18 Apr 2024 19:11:27 +0000 (21:11 +0200)
		1	2
src/pcrlock/pcrlock.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/tpm2-util.c	patch \|	diff1 \|	diff2 \|	blob \| history