From: Arnaldo Carvalho de Melo Date: Fri, 6 Sep 2024 14:42:59 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf-tools-next X-Git-Tag: ceph-for-6.12-rc2~111^2~42 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=92984e446857432b7e3257d609297355a7a14fc6;p=ceph-client.git 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 --- 92984e446857432b7e3257d609297355a7a14fc6