Merge pull request #34783 from keszybz/man-nspawn-private-users

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

Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)

committer GitHub <noreply@github.com>

Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)
committer GitHub <noreply@github.com>
Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)
diff --cc NEWS
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)
committer	GitHub <noreply@github.com>
	Fri, 18 Oct 2024 16:44:05 +0000 (18:44 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history