Merge e0756cfc ("Merge tag 'trace-v5.11-rc7' of...

Merge e0756cfc ("Merge tag 'trace-v5.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace"

) into android-mainline

Final steps on the way to 5.12

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