Merge branch 'master' into net-next

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iplink.c
index 8bc9f49763fcc29175630ffc89ac99d3195707a2,5361c2f9fafcce04cba04ae8b616b83213674525..97f46cdee56714808628b2489732d056a7fa035d
--- 1/ip/iplink.c
--- 2/ip/iplink.c
+++ b/ip/iplink.c
@@@ -613,22 -633,10 +634,22 @@@ int iplink_parse(int argc, char **argv
                                invarg("Invalid \"link-netnsid\" value\n", *argv);
                        addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID,
                                  link_netnsid);
 +              } else if (strcmp(*argv, "protodown") == 0) {
 +                      unsigned int proto_down;
 +
 +                      NEXT_ARG();
 +                      if (strcmp(*argv, "on") == 0)
 +                              proto_down = 1;
 +                      else if (strcmp(*argv, "off") == 0)
 +                              proto_down = 0;
 +                      else
 +                              return on_off("protodown", *argv);
 +                      addattr8(&req->n, sizeof(*req), IFLA_PROTO_DOWN,
 +                               proto_down);
                } else {
-                       if (strcmp(*argv, "dev") == 0) {
+                       if (strcmp(*argv, "dev") == 0)
                                NEXT_ARG();
-                       }
+ 
                        if (matches(*argv, "help") == 0)
                                usage();
                        if (*dev)

diff --cc man/man8/ip-link.8.in
Simple merge