Merge pull request #26641 from medhefgo/boot-elf2efi

author Yu Watanabe <watanabe.yu+github@gmail.com>

Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)

committer GitHub <noreply@github.com>

Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)
committer GitHub <noreply@github.com>
Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)
diff --cc man/systemd-measure.xml
Simple merge
diff --cc src/basic/meson.build
Simple merge
diff --cc src/shared/meson.build
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)
committer	GitHub <noreply@github.com>
	Sat, 11 Mar 2023 08:15:01 +0000 (17:15 +0900)
		1	2
man/systemd-measure.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/meson.build	patch \|	diff1 \|	diff2 \|	blob \| history