]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge remote-tracking branch 'torvalds/master' into perf-tools-next
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 6 Sep 2024 14:42:59 +0000 (11:42 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 6 Sep 2024 14:42:59 +0000 (11:42 -0300)
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>

Trivial merge