Merge branch 'master' into net-next

2017-12-12 12:12:20 -08:00 · 2017-12-12 12:12:20 -08:00 · 3a2fbf007b
parent 81724d6142 88b428f03f
commit 3a2fbf007b
2 changed files with 622 additions and 275 deletions
--- a/bash-completion/tc
+++ b/bash-completion/tc
@ -450,7 +450,7 @@ _tc_filter_options()
            return 0
            ;;
        matchall)
-            _tc_once_attr 'action skip_sw skip_hw'
+            _tc_once_attr 'action classid skip_sw skip_hw'
            return 0
            ;;
        flower)
--- a/misc/ss.c
+++ b/misc/ss.c