From: Arnaldo Carvalho de Melo Date: Tue, 6 Aug 2024 17:01:06 +0000 (-0300) Subject: Merge remote-tracking branch 'torvalds/master' into perf-tools-next X-Git-Tag: v6.12-rc1~109^2~239 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ce8a562a9f54d5eb4d35727e93dfb90925e349;p=thirdparty%2Fkernel%2Fstable.git Merge remote-tracking branch 'torvalds/master' into perf-tools-next To pick a patch that albeit being for tools/perf/ directory went thru a different tree and ended up breaking some recent tests introduced in the perf-tools-next tree to validate duplicate events in the JSON performance event files. Link: https://lore.kernel.org/lkml/ZrIqDMg7cBVhstYU@x1 Signed-off-by: Arnaldo Carvalho de Melo --- 37ce8a562a9f54d5eb4d35727e93dfb90925e349