From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2021 18:11:51 +0000 (-0800)
Subject: Merge tag 'trace-v5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: baikal/aarch64/sdk6.1~5297
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=a0b9d21128bf7728fe1eaff2c7ba60b5cdc9d66a;p=kernel.git

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

Pull tracing fixes from Steven Rostedt:
 "Three tracing fixes:

   - Make local osnoise_instances static

   - Copy just actual size of histogram strings

   - Properly check missing operands in histogram expressions"

* tag 'trace-v5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/histogram: Fix check for missing operands in an expression
  tracing/histogram: Do not copy the fixed-size char array field over the field size
  tracing/osnoise: Make osnoise_instances static
---

a0b9d21128bf7728fe1eaff2c7ba60b5cdc9d66a