diff options
| author |   Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2023-06-05 11:10:23 +0100 |
| commit | 9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a (patch) | |
| tree | cbffbccb83865b418a0aabb4487b6e8fe70c590d /tools/perf/scripts/python/task-analyzer.py | |
| parent | drm/i915/gt: Add workaround 14016712196 (diff) | |
| parent | Merge tag 'drm-misc-next-2023-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| download | wireguard-linux-9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a.tar.xz wireguard-linux-9ff17e6bdaa50892dd9bdb1b116cb71b73dd711a.zip | |
Merge drm/drm-next into drm-intel-gt-next
For conflict avoidance we need the following commit:
c9a9f18d3ad8 drm/i915/huc: use const struct bus_type pointers
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/task-analyzer.py')
| -rwxr-xr-x | tools/perf/scripts/python/task-analyzer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/task-analyzer.py b/tools/perf/scripts/python/task-analyzer.py index 52e8dae9b1f0..3f1df9894246 100755 --- a/tools/perf/scripts/python/task-analyzer.py +++ b/tools/perf/scripts/python/task-analyzer.py @@ -114,7 +114,7 @@ def _parse_args(): "--ns", action="store_true", help="show timestamps in nanoseconds" ) parser.add_argument( - "--ms", action="store_true", help="show timestamps in miliseconds" + "--ms", action="store_true", help="show timestamps in milliseconds" ) parser.add_argument( "--extended-times", |