Merge pull request #15909 from keszybz/sd-network-serialization

author Lennart Poettering <lennart@poettering.net>

Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)

committer GitHub <noreply@github.com>

Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)
author Lennart Poettering <lennart@poettering.net>
Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)
committer GitHub <noreply@github.com>
Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)
diff --cc TODO
Simple merge
diff --cc src/network/networkd-link.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)
committer	GitHub <noreply@github.com>
	Tue, 26 May 2020 13:37:57 +0000 (15:37 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-link.c	patch \|	diff1 \|	diff2 \|	blob \| history