From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 27 Nov 2021 20:03:57 +0000 (-0800)
Subject: Merge tag 'trace-v5.16-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted... 
X-Git-Tag: v5.16-rc3~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86155d6b43ced7768b70e7b57bcf53a6fb6b1f2d;p=users%2Fdwmw2%2Flinux.git

Merge tag 'trace-v5.16-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two fixes to event pid filtering:

   - Make sure newly created events reflect the current state of pid
     filtering

   - Take pid filtering into account when recording trigger events.
     (Also clean up the if statement to be cleaner)"

* tag 'trace-v5.16-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix pid filtering when triggers are attached
  tracing: Check pid filtering when creating events
---

86155d6b43ced7768b70e7b57bcf53a6fb6b1f2d