OSDN Git Service

Merge tag 'perf_urgent_for_v6.3_rc3' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Mar 2023 16:47:55 +0000 (09:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Mar 2023 16:47:55 +0000 (09:47 -0700)
commit80102f2ee715ab07be476df443bba388d5458fd1
tree559275d37a89c75774d076ced56cc3247fff3586
parent4ac39c5910add53e77aad356cc19721206c76ef7
parentfd0815f632c24878e325821943edccc7fde947a2
Merge tag 'perf_urgent_for_v6.3_rc3' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Borislav Petkov:

 - Check whether sibling events have been deactivated before adding them
   to groups

 - Update the proper event time tracking variable depending on the event
   type

 - Fix a memory overwrite issue due to using the wrong function argument
   when outputting perf events

* tag 'perf_urgent_for_v6.3_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Fix check before add_event_to_groups() in perf_group_detach()
  perf: fix perf_event_context->time
  perf/core: Fix perf_output_begin parameter is incorrectly invoked in perf_event_bpf_output