tree 3fb756eb47016c58b3e3934c75ecddf88eed66ee
parent c13320499ba0efd93174ef6462ae8a7a2933f6e7
parent 4f1b067359ac8364cdb7f9fda41085fa85789d0f
author Linus Torvalds <torvalds@linux-foundation.org> 1716742466 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1716742466 -0700
mergetag object 4f1b067359ac8364cdb7f9fda41085fa85789d0f
 type commit
 tag perf-tools-fixes-for-v6.10-1-2024-05-26
 tagger Arnaldo Carvalho de Melo <acme@redhat.com> 1716724062 -0300
 
 Revert a patch causing a regression as described in the cset:
 
     "This made a simple 'perf record -e cycles:pp make -j199' stop working on
     the Ampere ARM64 system Linus uses to test ARM64 kernels, as discussed
     at length in the threads in the Link tags below.
 
     The fix provided by Ian wasn't acceptable and work to fix this will take
     time we don't have at this point, so lets revert this and work on it on
     the next devel cycle."
 
 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCZlMhdgAKCRCyPKLppCJ+
 JzCNAPwM7gQLjeoCdkn9KDl1fj1R7/jBE/TsVqP9s1htc9vJEgD/UgLDkpdzlxBC
 HbndVTOrnvyV9ySA28654ODHpQxmXwM=
 =WJwT
 -----END PGP SIGNATURE-----

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"