From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Dec 2017 02:21:33 +0000 (-0800)
Subject: Merge tag 'trace-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v5.15~9804
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04243787812cabb57726e50d8288a3dcacf54ad2;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'trace-v4.15-rc1' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Various fix-ups:

   - comment fixes

   - build fix

   - better memory alloction (don't use NR_CPUS)

   - configuration fix

   - build warning fix

   - enhanced callback parameter (to simplify users of trace hooks)

   - give up on stack tracing when RCU isn't watching (it's a lost
     cause)"

* tag 'trace-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Have stack trace not record if RCU is not watching
  tracing: Pass export pointer as argument to ->write()
  ring-buffer: Remove unused function __rb_data_page_index()
  tracing: make PREEMPTIRQ_EVENTS depend on TRACING
  tracing: Allocate mask_str buffer dynamically
  tracing: always define trace_{irq,preempt}_{enable_disable}
  tracing: Fix code comments in trace.c
---

04243787812cabb57726e50d8288a3dcacf54ad2