Merge branch 'master' into net-next

diff --cc ip/iproute.c
Simple merge

diff --cc tc/f_flower.c
index dfd515258258986b37468200d1c88a848c0671f8,f39b1f7fd7047a1d121c44814637118084b7804d..1555764b99969c6bd190c256dfcd84c473be9a71
--- 1/tc/f_flower.c
--- 2/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -25,30 -25,28 +25,29 @@@
  
  static void explain(void)
  {
 -      fprintf(stderr, "Usage: ... flower [ MATCH-LIST ]\n");
 -      fprintf(stderr, "                  [ skip_sw | skip_hw ]\n");
 -      fprintf(stderr, "                  [ action ACTION-SPEC ] [ classid CLASSID ]\n");
 -      fprintf(stderr, "\n");
 -      fprintf(stderr, "Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n");
 -      fprintf(stderr, "       MATCH      := { indev DEV-NAME |\n");
 -      fprintf(stderr, "                       vlan_id VID |\n");
 -      fprintf(stderr, "                       vlan_prio PRIORITY |\n");
 -      fprintf(stderr, "                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n");
 -      fprintf(stderr, "                       dst_mac MAC-ADDR |\n");
 -      fprintf(stderr, "                       src_mac MAC-ADDR |\n");
 -      fprintf(stderr, "                       ip_proto [tcp | udp | IP-PROTO ] |\n");
 -      fprintf(stderr, "                       dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n");
 -      fprintf(stderr, "                       src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n");
 -      fprintf(stderr, "                       dst_port PORT-NUMBER |\n");
 -      fprintf(stderr, "                       src_port PORT-NUMBER }\n");
 -      fprintf(stderr, "       FILTERID := X:Y:Z\n");
 -      fprintf(stderr, "       ACTION-SPEC := ... look at individual actions\n");
 -      fprintf(stderr, "\n");
 -      fprintf(stderr, "NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n");
 -      fprintf(stderr, "NOTE: There can be only used one mask per one prio. If user needs\n");
 -      fprintf(stderr, "      to specify different mask, he has to use different prio.\n");
 +      fprintf(stderr,
 +              "Usage: ... flower [ MATCH-LIST ]\n"
 +              "                  [ skip_sw | skip_hw ]\n"
 +              "                  [ action ACTION-SPEC ] [ classid CLASSID ]\n"
 +              "\n"
 +              "Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n"
 +              "       MATCH      := { indev DEV-NAME |\n"
 +              "                       vlan_id VID |\n"
 +              "                       vlan_prio PRIORITY |\n"
 +              "                       vlan_ethtype [ ipv4 | ipv6 | ETH-TYPE ] |\n"
 +              "                       dst_mac MAC-ADDR |\n"
 +              "                       src_mac MAC-ADDR |\n"
-               "                       [ipv4 | ipv6 ] |\n"
 +              "                       ip_proto [tcp | udp | IP-PROTO ] |\n"
 +              "                       dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
 +              "                       src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
 +              "                       dst_port PORT-NUMBER |\n"
 +              "                       src_port PORT-NUMBER }\n"
 +              "       FILTERID := X:Y:Z\n"
 +              "       ACTION-SPEC := ... look at individual actions\n"
 +              "\n"
-               "NOTE: CLASSID, ETH-TYPE, IP-PROTO are parsed as hexadecimal input.\n"
++              "NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n"
 +              "NOTE: There can be only used one mask per one prio. If user needs\n"
 +              "      to specify different mask, he has to use different prio.\n");
  }
  
  static int flower_parse_eth_addr(char *str, int addr_type, int mask_type,