From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Jun 2023 17:13:17 +0000 (-0700)
Subject: Merge tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.4~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=547cc9be86f4c51c51fd429ace6c2e1ef9050d15;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'perf_urgent_for_v6.4' of git://git.kernel.org/pub/scm/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
---

547cc9be86f4c51c51fd429ace6c2e1ef9050d15