Merge pull request #14767 from yuwata/network-split-qdisc-section

author Yu Watanabe <watanabe.yu+github@gmail.com>

Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)

committer GitHub <noreply@github.com>

Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)
committer GitHub <noreply@github.com>
Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)
diff --cc NEWS
Simple merge
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/network/networkd-network.c
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)
committer	GitHub <noreply@github.com>
	Wed, 5 Feb 2020 04:35:25 +0000 (13:35 +0900)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network.c	patch \|	diff1 \|	diff2 \|	blob \| history