Merge branch 'master' into net-next

diff --cc man/man8/ip-link.8.in
index 8e312978ce5f27d4b13e31c66dc146e1f764a29e,239f76494905690bd764479a091b3cc911a4f548..057125b5aa19df8af35da479e61646a142ec2d25
--- 1/man/man8/ip-link.8.in
--- 2/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@@ -350,51 -348,65 +350,108 @@@ are entered into the VXLAN device forwa
  .BI maxaddress " NUMBER"
  - specifies the maximum number of FDB entries.
  
 +.sp
 +.B gbp
 +- enables the Group Policy extension (VXLAN-GBP).
 +
 +.in +4
 +Allows to transport group policy context across VXLAN network peers.
 +If enabled, includes the mark of a packet in the VXLAN header for outgoing
 +packets and fills the packet mark based on the information found in the
 +VXLAN header for incomming packets.
 +
 +Format of upper 16 bits of packet mark (flags);
 +
 +.in +2
 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +.br
 +|-|-|-|-|-|-|-|-|-|D|-|-|A|-|-|-|
 +.br
 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +
 +.B D :=
 +Don't Learn bit. When set, this bit indicates that the egress
 +VTEP MUST NOT learn the source address of the encapsulated frame.
 +
 +.B A :=
 +Indicates that the group policy has already been applied to
 +this packet. Policies MUST NOT be applied by devices when the A bit is set.
 +.in -2
 +
 +Format of lower 16 bits of packet mark (policy ID):
 +
 +.in +2
 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +.br
 +|        Group Policy ID        |
 +.br
 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 +.in -2
 +
 +Example:
 +  iptables -A OUTPUT [...] -j MARK --set-mark 0x800FF
 +
 +.in -4
 +
  .in -8
  
+ .TP
+ GRE, IPIP, SIT Type Support
+ For a link of types
+ .I GRE/IPIP/SIT
+ the following additional arguments are supported:
+ 
+ .BI "ip link add " DEVICE
+ .BR type " { gre | ipip | sit } "
+ .BI " remote " ADDR " local " ADDR
+ .R " [ "
+ .BR encap " { fou | gue | none } "
+ .R " ] [ "
+ .BI "encap-sport { " PORT " | auto } "
+ .R " ] [ "
+ .BI "encap-dport " PORT
+ .R " ] [ "
+ .I " [no]encap-csum "
+ .R " ] [ "
+ .I " [no]encap-remcsum "
+ .R " ]"
+ 
+ .in +8
+ .sp
+ .BI  remote " ADDR "
+ - specifies the remote address of the tunnel.
+ 
+ .sp
+ .BI  local " ADDR "
+ - specifies the fixed local address for tunneled packets.
+ It must be an address on another interface on this host.
+ 
+ .sp
+ .BR encap " { fou | gue | none } "
+ - specifies type of secondary UDP encapsulation. "fou" indicates
+ Foo-Over-UDP, "gue" indicates Generic UDP Encapsulation.
+ 
+ .sp
+ .BI "encap-sport { " PORT " | auto } "
+ - specifies the source port in UDP encapsulation.
+ .IR PORT
+ indicates the port by number, "auto"
+ indicates that the port number should be chosen automatically
+ (the kernel picks a flow based on the flow hash of the
+ encapsulated packet).
+ 
+ .sp
+ .I [no]encap-csum
+ - specifies if UDP checksums are enabled in the secondary
+ encapsulation.
+ 
+ .sp
+ .I [no]encap-remcsum
+ - specifies if Remote Checksum Offload is enabled. This is only
+ applicable for Generic UDP Encapsulation.
+ 
+ .in -8
+ 
  .TP
  IP6GRE/IP6GRETAP Type Support
  For a link of type