diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-09-06 11:42:59 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2024-09-06 11:42:59 -0300 |
| commit | 92984e446857432b7e3257d609297355a7a14fc6 (patch) | |
| tree | 7dccc374a31a4fd146816fc734921e48e7cd1bfe /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | 35439fe4e29bca5fe8da8ed3f8524ef98f3e7aae (diff) | |
| parent | b831f83e40a24f07c8dcba5be408d93beedc820f (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
To pick up fixes from perf-tools/perf-tools, some of which were also in
perf-tools-next but were then indentified as being more appropriate to
go sooner, to fix regressions in v6.11.
Resolve a simple merge conflict in tools/perf/tests/pmu.c where a more
future proof approach to initialize all fields of a struct was used in
perf-tools-next, the one that is going into v6.11 is enough for the
segfault it addressed (using an uninitialized test_pmu.alias field).
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions