Merge pull request #30232 from keszybz/ukify-imports

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)

committer GitHub <noreply@github.com>

Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)
committer GitHub <noreply@github.com>
Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)
diff --cc src/kernel-install/60-ukify.install.in
Simple merge
diff --cc src/ukify/ukify.py
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)
committer	GitHub <noreply@github.com>
	Wed, 13 Dec 2023 13:38:03 +0000 (14:38 +0100)
		1	2
src/kernel-install/60-ukify.install.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/ukify/ukify.py	patch \|	diff1 \|	diff2 \|	blob \| history