Merge pull request #29345 from poettering/measured-uki-condition

author Lennart Poettering <lennart@poettering.net>

Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)

committer GitHub <noreply@github.com>

Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)
committer GitHub <noreply@github.com>
Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)
diff --cc TODO
Simple merge
diff --cc src/cryptsetup/cryptsetup.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)
committer	GitHub <noreply@github.com>
	Wed, 27 Sep 2023 14:39:46 +0000 (16:39 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/cryptsetup/cryptsetup.c	patch \|	diff1 \|	diff2 \|	blob \| history