Merge pull request #2726 from sworleys/Netlink-Filter-AFI

author Renato Westphal <renato@openbsd.org>

Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)

committer GitHub <noreply@github.com>

Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)
author Renato Westphal <renato@openbsd.org>
Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)
committer GitHub <noreply@github.com>
Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)
diff --cc zebra/if_netlink.c
Simple merge
diff --cc zebra/rt_netlink.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)
committer	GitHub <noreply@github.com>
	Mon, 6 Aug 2018 23:26:46 +0000 (20:26 -0300)
		1	2
zebra/if_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history