Merge 32f6c5d0 ("Merge tag 'trace-v5.17-rc2' of...

Merge 32f6c5d0 ("Merge tag 'trace-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace"

) into android-mainline

Steps on the way to 5.17-rc4

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I68de7c000b56d08e4c0069f7b4f260ddc2a26329