Merge branch 'master' into net-next

diff --cc tc/f_flower.c
index 6d9a3b70afed1cb0d5086b8a94a4c5b496ae2b99,71e9515f501ad39205288580b561a5b05d338812..4d305b6e1e6317acb46ccb2bf6a4fd8f723da026
--- 1/tc/f_flower.c
--- 2/tc/f_flower.c
+++ b/tc/f_flower.c
@@@ -53,12 -53,12 +53,13 @@@ static void explain(void
                "                       dst_port PORT-NUMBER |\n"
                "                       src_port PORT-NUMBER |\n"
                "                       type ICMP-TYPE |\n"
-               "                       code ICMP-CODE }\n"
-               "                       enc_dst_ip PREFIX |\n"
-               "                       enc_src_ip PREFIX |\n"
-               "                       enc_key_id [ KEY-ID ] }\n"
+               "                       code ICMP-CODE |\n"
+               "                       enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+               "                       enc_src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
+               "                       enc_key_id [ KEY-ID ] |\n"
+               "                       enc_dst_port [ UDP-PORT ] }\n"
                "       FILTERID := X:Y:Z\n"
 +              "       MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n"
                "       ACTION-SPEC := ... look at individual actions\n"
                "\n"
                "NOTE: CLASSID, IP-PROTO are parsed as hexadecimal input.\n"