Merge pull request #22519 from poettering/boot-order-title-revert

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

Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)

committer GitHub <noreply@github.com>

Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)
committer GitHub <noreply@github.com>
Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)
diff --cc src/boot/bootctl.c
Simple merge
diff --cc src/shared/bootspec.c
Simple merge
diff --cc src/shared/bootspec.h
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)
committer	GitHub <noreply@github.com>
	Fri, 18 Mar 2022 18:04:48 +0000 (19:04 +0100)
		1	2
src/boot/bootctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bootspec.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bootspec.h	patch \|	diff1 \|	diff2 \|	blob \| history