Merge pull request #24001 from yuwata/network-lifetime-fix

author Luca Boccassi <bluca@debian.org>

Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)

committer GitHub <noreply@github.com>

Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)
author Luca Boccassi <bluca@debian.org>
Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)
committer GitHub <noreply@github.com>
Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)
diff --cc src/network/networkd-dhcp4.c
Simple merge
diff --cc src/network/networkd-dhcp6.c
Simple merge
diff --cc src/network/networkd-ndisc.c
Simple merge
author	Luca Boccassi <bluca@debian.org>
	Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)
committer	GitHub <noreply@github.com>
	Mon, 18 Jul 2022 09:02:02 +0000 (10:02 +0100)
		1	2
src/network/networkd-dhcp4.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-dhcp6.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-ndisc.c	patch \|	diff1 \|	diff2 \|	blob \| history