Merge branch 'master' into net-next

diff --cc ip/iproute.c
Simple merge

diff --cc man/man8/tc-csum.8
Simple merge

diff --cc tc/f_flower.c
index a6c0e1cda427f22dea3557b749a1bec121f9df30,145a85666c4e6f0890ecea5de499e793216e9eac..403100c92af0eeadac7cd4d088e8d00585f78892
--- 1/tc/f_flower.c
--- 2/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -759,19 -529,11 +759,21 @@@ parse_done
        if (ret)
                return ret;
  
-       ret = addattr16(n, MAX_MSG, TCA_FLOWER_KEY_ETH_TYPE, eth_type);
-       if (ret)
-               return ret;
 +      if (mtf_mask) {
 +              ret = addattr32(n, MAX_MSG, TCA_FLOWER_KEY_FLAGS, htonl(mtf));
 +              if (ret)
 +                      return ret;
 +
 +              ret = addattr32(n, MAX_MSG, TCA_FLOWER_KEY_FLAGS_MASK, htonl(mtf_mask));
 +              if (ret)
 +                      return ret;
 +      }
 +
+       if (eth_type != htons(ETH_P_ALL)) {
+               ret = addattr16(n, MAX_MSG, TCA_FLOWER_KEY_ETH_TYPE, eth_type);
+               if (ret)
+                       return ret;
+       }
  
        tail->rta_len = (((void *)n)+n->nlmsg_len) - (void *)tail;