Merge tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Jun 2023 17:13:17 +0000 (10:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Jun 2023 17:13:17 +0000 (10:13 -0700)
commit547cc9be86f4c51c51fd429ace6c2e1ef9050d15
tree723489ee03f7938a062578799b41f395c07416ab
parent300edd751b102715dda0fe44b4bf8442f6ccf9db
parenta6742cb90b567f952a95efa27dee345748d09fc7
Merge tag 'perf_urgent_for_v6.4' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Borislav Petkov:

 - Drop the __weak attribute from a function prototype as it otherwise
   leads to the function getting replaced by a dummy stub

 - Fix the umask value setup of the frontend event as former is
   different on two Intel cores

* tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix the FRONTEND encoding on GNR and MTL
  perf/core: Drop __weak attribute from arch_perf_update_userpage() prototype