Merge branch 'master' into net-next

diff --cc ip/ipaddress.c
Simple merge

diff --cc ip/iplink.c
Simple merge

diff --cc ip/iplink_bond.c
Simple merge

diff --cc ip/iplink_bridge.c
index a8bc8406776e6d53799741cf43f4e5dd3f224b09,61e4cdaba4c1af3e3dfcf1b7b8a32832237e754d..f1c6968d8a99d00a973d74a98ce3eb2f93ff2184
--- 1/ip/iplink_bridge.c
--- 2/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@@ -80,20 -74,10 +75,19 @@@ static int bridge_parse_opt(struct link
                        __u16 prio;
  
                        NEXT_ARG();
-                       if (get_u16(&prio, *argv, 0)) {
+                       if (get_u16(&prio, *argv, 0))
                                invarg("invalid priority", *argv);
-                               return -1;
-                       }
+ 
                        addattr16(n, 1024, IFLA_BR_PRIORITY, prio);
 +              } else if (matches(*argv, "vlan_filtering") == 0) {
 +                      __u8 vlan_filter;
 +
 +                      NEXT_ARG();
 +                      if (get_u8(&vlan_filter, *argv, 0)) {
 +                              invarg("invalid vlan_filtering", *argv);
 +                              return -1;
 +                      }
 +                      addattr8(n, 1024, IFLA_BR_VLAN_FILTERING, vlan_filter);
                } else if (matches(*argv, "help") == 0) {
                        explain();
                        return -1;

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