Merge pull request #24629 from DaanDeMeyer/mkosi-kernel

author Daan De Meyer <daan.j.demeyer@gmail.com>

Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)

committer GitHub <noreply@github.com>

Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)
author Daan De Meyer <daan.j.demeyer@gmail.com>
Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)
committer GitHub <noreply@github.com>
Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)
diff --cc mkosi.build
Simple merge
diff --cc mkosi.default.d/debian/10-mkosi.debian
Simple merge
diff --cc mkosi.default.d/ubuntu/10-mkosi.ubuntu
Simple merge
author	Daan De Meyer <daan.j.demeyer@gmail.com>
	Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)
committer	GitHub <noreply@github.com>
	Tue, 11 Oct 2022 12:37:19 +0000 (14:37 +0200)
		1	2
mkosi.build	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi.default.d/debian/10-mkosi.debian	patch \|	diff1 \|	diff2 \|	blob \| history
mkosi.default.d/ubuntu/10-mkosi.ubuntu	patch \|	diff1 \|	diff2 \|	blob \| history