Merge branch 'master' into net-next

diff --combined man/man8/ip-link.8.in
index 141d3597f945b659a89f3b5c90d38ff0f69da1ae,a7827124b6810c254463e16a60028b85d6b99487..c0207281905d757a591f6b203e056dd3ca07fa5f
--- 1/man/man8/ip-link.8.in
--- 2/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@@ -126,7 -126,7 +126,7 @@@ ip-link \- network device configuratio
  .RB "[ " port_guid " eui64 ] ]"
  .br
  .in -9
 -.RB "[ { " xdp " | " xdpgeneric  " } { " off " | "
 +.RB "[ { " xdp " | " xdpgeneric  " | " xdpdrv " | " xdpoffload " } { " off " | "
  .br
  .in +8
  .BR object
@@@ -660,7 -660,9 +660,9 @@@ the following additional arguments are 
  ] [
  .RB [ no ] encap-csum
  ] [
- .RB [ no ] encap-remcsum
+ .I " [no]encap-remcsum "
+ ] [
+ .I " mode " { ip6ip | ipip | mplsip | any } "
  ]
  
  .in +8
@@@ -697,6 -699,14 +699,14 @@@ encapsulation
  - specifies if Remote Checksum Offload is enabled. This is only
  applicable for Generic UDP Encapsulation.
  
+ .sp
+ .BI mode " { ip6ip | ipip | mplsip | any } "
+ - specifies mode in which device should run. "ip6ip" indicates
+ IPv6-Over-IPv4, "ipip" indicates "IPv4-Over-IPv4", "mplsip" indicates
+ MPLS-Over-IPv4, "any" indicates IPv6, IPv4 or MPLS Over IPv4. Supported for
+ SIT where the default is "ip6ip" and IPIP where the default is "ipip".
+ IPv6-Over-IPv4 is not supported for IPIP.
+ 
  .in -8
  
  .TP
@@@ -1589,17 -1599,6 +1599,17 @@@ only. If the driver does have native XD
  loaded under
  .B xdpgeneric object "|" pinned
  then the kernel will use the generic XDP variant instead of the native one.
 +.B xdpdrv
 +has the opposite effect of requestsing that the automatic fallback to the
 +generic XDP variant be disabled and in case driver is not XDP-capable error
 +should be returned.
 +.B xdpdrv
 +also disables hardware offloads.
 +.B xdpoffload
 +in ip link output indicates that the program has been offloaded to hardware
 +and can also be used to request the "offload" mode, much like
 +.B xdpgeneric
 +it forces program to be installed specifically in HW/FW of the apater.
  
  .B off
  (or

diff --combined man/man8/tc-ife.8
index 24595cc6d615c29f7af49824b781e0bb2bd8aa4a,1499a3fc5b80ef59abd04359fed922b880c57288..3a42d51b32e2d146f3b6874dcbd75c3896ecc1fa
--- 1/man/man8/tc-ife.8
--- 2/man/man8/tc-ife.8
+++ b/man/man8/tc-ife.8
@@@ -34,7 -34,7 +34,7 @@@ IFE - encapsulate/decapsulate metadat
  
  .ti -8
  .IR CONTROL " := { "
 -.BR reclassify " | " use " | " pipe " | " drop " | " continue " | " ok " }"
 +.BR reclassify " | " use " | " pipe " | " drop " | " continue " | " ok " | " goto " " chain " " CHAIN_INDEX " }"
  .SH DESCRIPTION
  The
  .B ife
@@@ -59,7 -59,10 +59,10 @@@ Encode direction only. Enforce static e
  .BR mark " [ "
  .IR u32_value " ]"
  The value to set for the skb mark. The u32 value is required only when
- .BR use " is specified."
+ .BR use " is specified. If
+ .BR mark " value is zero, it will not be encoded, instead
+ "overlimits" statistics increment and
+ .BR CONTROL " action is taken.
  .TP
  .BR prio " [ "
  .IR u32_value " ]"