Merge pull request #21036 from yuwata/network-dhcp6-pd-manage-prefix-with-hashmap

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

Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)

committer GitHub <noreply@github.com>

Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)
committer GitHub <noreply@github.com>
Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)
diff --cc src/network/networkd-dhcp6.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)
committer	GitHub <noreply@github.com>
	Tue, 19 Oct 2021 07:22:32 +0000 (09:22 +0200)