From: Stephen Hemminger <stephen@networkplumber.org>
Date: Sun, 19 Feb 2017 00:32:16 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.11.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb8771573a96278f6ce34a85227130c39ab1f41b;p=thirdparty%2Fiproute2.git

Merge branch 'master' into net-next
---

bb8771573a96278f6ce34a85227130c39ab1f41b
diff --cc man/man8/Makefile
index 0ccc7312a,1bd2f0210..f33186446
--- a/man/man8/Makefile
+++ b/man/man8/Makefile
@@@ -16,8 -16,8 +16,8 @@@ MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnst
  	tc-basic.8 tc-cgroup.8 tc-flow.8 tc-flower.8 tc-fw.8 tc-route.8 \
  	tc-tcindex.8 tc-u32.8 tc-matchall.8 \
  	tc-connmark.8 tc-csum.8 tc-mirred.8 tc-nat.8 tc-pedit.8 tc-police.8 \
- 	tc-simple.8 tc-skbedit.8 tc-vlan.8 tc-xt.8 tc-ife.8 \
+ 	tc-simple.8 tc-skbedit.8 tc-vlan.8 tc-xt.8 tc-skbmod.8 tc-ife.8 \
 -	tc-tunnel_key.8 \
 +	tc-tunnel_key.8 tc-sample.8 \
  	devlink.8 devlink-dev.8 devlink-monitor.8 devlink-port.8 devlink-sb.8 \
  	ifstat.8