diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-03-29 15:39:10 +0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-03-29 15:39:10 +0200 |
commit | b0a752d43b1566451332bcb5b52b9694dfe7896c (patch) | |
tree | 1d5ea27a0ef6e74e2b9692e6c02d8d48710d1d36 /tools/perf/tests/shell | |
parent | perf sort: Display sort dimension p_stage_cyc only on supported archs (diff) | |
parent | Linux 5.12-rc5 (diff) | |
download | linux-b0a752d43b1566451332bcb5b52b9694dfe7896c.tar.xz linux-b0a752d43b1566451332bcb5b52b9694dfe7896c.zip |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes sent via perf/urgent and in the BPF tools/ directories.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/tests/shell')
-rwxr-xr-x | tools/perf/tests/shell/daemon.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/shell/daemon.sh b/tools/perf/tests/shell/daemon.sh index ee4a30ca3f57..45fc24af5b07 100755 --- a/tools/perf/tests/shell/daemon.sh +++ b/tools/perf/tests/shell/daemon.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # daemon operations # SPDX-License-Identifier: GPL-2.0 |