aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/scripts/python/bin/stackcollapse-report
diff options
context:
space:
mode:
authorJoonas Lahtinen <[email protected]>2021-09-15 13:23:27 +0300
committerJoonas Lahtinen <[email protected]>2021-09-15 13:23:27 +0300
commitd5dd580deb54483cce0cb5bbe3f1a132a28c767d (patch)
tree8803403033d49e5b57b81a68b02326943b24b067 /tools/perf/scripts/python/bin/stackcollapse-report
parente935405102783219b883b1e50539908f21463e9a (diff)
parent6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f (diff)
Merge drm/drm-next into drm-intel-gt-next
Close the divergence which has caused patches not to apply and have a solid baseline for the PXP patches that Rodrigo will send a topic branch PR for. Signed-off-by: Joonas Lahtinen <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/bin/stackcollapse-report')
-rwxr-xr-xtools/perf/scripts/python/bin/stackcollapse-report2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/bin/stackcollapse-report b/tools/perf/scripts/python/bin/stackcollapse-report
index 356b9656393d..21a356bd27f6 100755
--- a/tools/perf/scripts/python/bin/stackcollapse-report
+++ b/tools/perf/scripts/python/bin/stackcollapse-report
@@ -1,3 +1,3 @@
#!/bin/sh
# description: produce callgraphs in short form for scripting use
-perf script -s "$PERF_EXEC_PATH"/scripts/python/stackcollapse.py -- "$@"
+perf script -s "$PERF_EXEC_PATH"/scripts/python/stackcollapse.py "$@"