From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 May 2024 16:54:26 +0000 (-0700)
Subject: Merge tag 'perf-tools-fixes-for-v6.10-1-2024-05-26' of git://git.kernel.org/pub/scm... 
X-Git-Tag: nvme-6.10-2024-06-05~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6fbf71854e2ddea7c99397772fbbb3783bfe15b5;p=nvme.git

Merge tag 'perf-tools-fixes-for-v6.10-1-2024-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools

Pull perf tool fix from Arnaldo Carvalho de Melo:
 "Revert a patch causing a regression.

  This made a simple 'perf record -e cycles:pp make -j199' stop working
  on the Ampere ARM64 system Linus uses to test ARM64 kernels".

* tag 'perf-tools-fixes-for-v6.10-1-2024-05-26' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
  Revert "perf parse-events: Prefer sysfs/JSON hardware events over legacy"
---

6fbf71854e2ddea7c99397772fbbb3783bfe15b5