Merge pull request #10407 from yuwata/netlink-slot

author Lennart Poettering <lennart@poettering.net>

Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)

committer GitHub <noreply@github.com>

Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)
committer GitHub <noreply@github.com>
Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)
diff --cc TODO
Simple merge
diff --cc src/network/networkd-route.c
Simple merge
diff --cc src/systemd/sd-bus.h
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)
committer	GitHub <noreply@github.com>
	Thu, 18 Oct 2018 16:05:58 +0000 (18:05 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-route.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/systemd/sd-bus.h	patch \|	diff1 \|	diff2 \|	blob \| history