Merge pull request #12576 from ssahani/fou

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

Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)

committer GitHub <noreply@github.com>

Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)
author Yu Watanabe <watanabe.yu+github@gmail.com>
Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)
committer GitHub <noreply@github.com>
Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)
diff --cc man/systemd.netdev.xml
Simple merge
diff --cc src/libsystemd/sd-netlink/netlink-types.c
Simple merge
diff --cc src/network/netdev/netdev-gperf.gperf
Simple merge
diff --cc test/fuzz/fuzz-netdev-parser/directives.netdev
Simple merge
author	Yu Watanabe <watanabe.yu+github@gmail.com>
	Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)
committer	GitHub <noreply@github.com>
	Thu, 16 May 2019 03:10:35 +0000 (05:10 +0200)
		1	2
man/systemd.netdev.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-netlink/netlink-types.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/network/netdev/netdev-gperf.gperf	patch \|	diff1 \|	diff2 \|	blob \| history
test/fuzz/fuzz-netdev-parser/directives.netdev	patch \|	diff1 \|	diff2 \|	blob \| history