Merge pull request #14337 from yuwata/network-tc-fq-more

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

Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)

committer GitHub <noreply@github.com>

Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)
committer GitHub <noreply@github.com>
Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)
diff --cc man/systemd.network.xml
Simple merge
diff --cc src/libsystemd/sd-netlink/netlink-types.c
Simple merge
diff --cc src/network/networkd-network-gperf.gperf
Simple merge
diff --cc test/test-network/systemd-networkd-tests.py
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)
committer	GitHub <noreply@github.com>
	Tue, 17 Dec 2019 14:30:10 +0000 (23:30 +0900)
		1	2
man/systemd.network.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-netlink/netlink-types.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network-gperf.gperf	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-network/systemd-networkd-tests.py	patch \|	diff1 \|	diff2 \|	blob \| history