Merge branch 'master' into net-next

 Conflicts:
	man/man8/ip-link.8.in

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --cc ip/iplink.c
Simple merge

diff --cc ip/link_gre.c
index 65ad8bad4b825642706cf5d58c601cece81ecc41,3c0b6d678afcfc950839e12f7defe5b45dd10f88..52c581d224ac582ae7231340bd09af5a85d52324
--- 1/ip/link_gre.c
--- 2/ip/link_gre.c
+++ b/ip/link_gre.c
@@@ -43,12 -43,9 +43,13 @@@ static void print_usage(FILE *f
                "                            [ [no]encap-csum ]\n"
                "                            [ [no]encap-csum6 ]\n"
                "                            [ [no]encap-remcsum ]\n"
+               "                            [ external ]\n"
                "                            [ fwmark MARK ]\n"
 +              "                            [ erspan_ver version ]\n"
                "                            [ erspan IDX ]\n"
 +              "                            [ erspan_dir { ingress | egress } ]\n"
 +              "                            [ erspan_hwid hwid ]\n"
 +              "                            [ external ]\n"
                "\n"
                "Where: ADDR := { IP_ADDRESS | any }\n"
                "       TOS  := { NUMBER | inherit }\n"

diff --cc ip/link_gre6.c
Simple merge

diff --cc man/man8/ip-link.8.in
index fc6694c0c72d340dc96c2bace9b2df9b07a64077,ff6bb9a2013c772dd0480cbc94a901195a1bf478..1d1f0363f4908cd23ff38bdc3e1140717d9cc7b8
--- 1/man/man8/ip-link.8.in
--- 2/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@@ -668,10 -652,33 +669,33 @@@ keyword
  
  .in -8
  
+ .TP
+ VETH, VXCAN Type Support
+ For a link of types
+ .I VETH/VXCAN
+ the following additional arguments are supported:
+ 
+ .BI "ip link add " DEVICE
+ .BR type " { " veth " | " vxcan " }"
+ [
+ .BR peer
+ .BI "name " NAME
+ ]
+ 
+ .in +8
+ .sp
+ .BR peer
+ .BI "name " NAME
+ - specifies the virtual pair device name of the
+ .I VETH/VXCAN
+ tunnel.
+ 
+ .in -8
+ 
  .TP
 -GRE, IPIP, SIT, ERSPAN Type Support
 +GRE, IPIP, SIT Type Support
  For a link of types
 -.I GRE/IPIP/SIT/ERSPAN
 +.I GRE/IPIP/SIT
  the following additional arguments are supported:
  
  .BI "ip link add " DEVICE
@@@ -689,6 -696,10 +713,8 @@@
  .I " [no]encap-remcsum "
  ] [
  .I " mode " { ip6ip | ipip | mplsip | any } "
 -.BR erspan " \fIIDX "
 -] [
+ ] [
+ .BR external
  ]
  
  .in +8
@@@ -733,6 -744,18 +759,11 @@@ MPLS-Over-IPv4, "any" indicates IPv6, I
  SIT where the default is "ip6ip" and IPIP where the default is "ipip".
  IPv6-Over-IPv4 is not supported for IPIP.
  
 -.sp
 -.BR erspan " \fIIDX "
 -- specifies the ERSPAN index field.
 -.IR IDX
 -indicates a 20 bit index/port number associated with the ERSPAN
 -traffic's source port and direction.
 -
+ .sp
+ .BR external
+ - make this tunnel externally controlled
+ .RB "(e.g. " "ip route encap" ).
+ 
  .in -8
  
  .TP