Merge pull request #22487 from poettering/bootspec-source-flags

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

Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)

committer GitHub <noreply@github.com>

Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)
committer GitHub <noreply@github.com>
Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)
diff --cc src/basic/stat-util.h
Simple merge
diff --cc src/login/logind-dbus.c
Simple merge
diff --cc src/shared/bootspec.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)
committer	GitHub <noreply@github.com>
	Mon, 14 Feb 2022 19:45:59 +0000 (04:45 +0900)
		1	2
src/basic/stat-util.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/login/logind-dbus.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/bootspec.c	patch \|	diff1 \|	diff2 \|	blob \| history