diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 15:36:11 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-07-18 15:36:11 +0200 |
| commit | 0698461ad2984892a47582a58eb235488d3aac7f (patch) | |
| tree | 107cfefee20b50f79cde3ed847f075bdbf50fad0 /drivers/misc/lis3lv02d | |
| parent | perf lock: Look up callchain for the contended locks (diff) | |
| parent | Linux 5.19-rc7 (diff) | |
| download | linux-0698461ad2984892a47582a58eb235488d3aac7f.tar.xz linux-0698461ad2984892a47582a58eb235488d3aac7f.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To update the perf/core codebase.
Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end
of evsel__config(), after what was added in:
49c692b7dfc9b6c0 ("perf offcpu: Accept allowed sample types only")
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/misc/lis3lv02d')
0 files changed, 0 insertions, 0 deletions