Merge pull request #20598 from tomty89/order_noauto

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

Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)

committer GitHub <noreply@github.com>

Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)
committer GitHub <noreply@github.com>
Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)
diff --cc src/core/mount.c
Simple merge
diff --cc src/fstab-generator/fstab-generator.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)
committer	GitHub <noreply@github.com>
	Sat, 11 Dec 2021 13:06:38 +0000 (14:06 +0100)
		1	2
src/core/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fstab-generator/fstab-generator.c	patch \|	diff1 \|	diff2 \|	blob \| history