From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 23 Jul 2023 22:19:14 +0000 (-0700)
Subject: Merge tag 'trace-v6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Tag: v6.6.17~4331
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b4e48b8007105695c913348ca11df50260a5ccb;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v6.5-rc2' of git://git./linux/kernel/git/trace/linux-trace

Pull tracing fixes from Steven Rostedt:

 - Swapping the ring buffer for snapshotting (for things like irqsoff)
   can crash if the ring buffer is being resized. Disable swapping when
   this happens. The missed swap will be reported to the tracer

 - Report error if the histogram fails to be created due to an error in
   adding a histogram variable, in event_hist_trigger_parse()

 - Remove unused declaration of tracing_map_set_field_descr()

* tag 'trace-v6.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/histograms: Return an error if we fail to add histogram to hist_vars list
  ring-buffer: Do not swap cpu_buffer during resize process
  tracing: Remove unused extern declaration tracing_map_set_field_descr()
---

3b4e48b8007105695c913348ca11df50260a5ccb