From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Jan 2016 21:32:39 +0000 (-0800)
Subject: Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v4.4~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ee9a7d2cb0cf1a1498478bc923d911f3d9c910ac;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two more fixes:

  1. The recordmcount change had an output that used sprintf()
     (incorrectly) when it should have been a fprintf() to stderr.

  2. The printk_formats file could crash if someone added a
     trace_printk() in the core kernel, and also added one in a module.
     This does not affect production kernels.  Only kernels where
     developers add trace_printk() for debugging can crash"

* tag 'trace-v4.4-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix setting of start_index in find_next()
  ftrace/scripts: Fix incorrect use of sprintf in recordmcount
---

ee9a7d2cb0cf1a1498478bc923d911f3d9c910ac