Merge pull request #19290 from yuwata/network-dhcp-do-not-configure-twice

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

Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)

committer GitHub <noreply@github.com>

Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)
committer GitHub <noreply@github.com>
Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)
diff --cc src/network/networkd-dhcp4.c
Simple merge
diff --cc src/network/networkd-link.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)
committer	GitHub <noreply@github.com>
	Fri, 16 Apr 2021 10:36:23 +0000 (12:36 +0200)
		1	2
src/network/networkd-dhcp4.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-link.c	patch \|	diff1 \|	diff2 \|	blob \| history