From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jun 2016 17:35:48 +0000 (-0700)
Subject: Merge tag 'trace-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v4.14-rc1~3000
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f780f00d723d991353b2a97a8a844ffefbc40505;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v4.7-rc3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fixes from Steven Rostedt:
 "Two fixes for the tracing system:

   - When trace_printk() is used with a non constant format descriptor,
     it adds a NULL pointer into the trace format section, and the code
     isn't prepared to deal with it.  This bug appeared by a change that
     was added in v3.5.

   - The ftracetest (selftests section) can't handle testing histograms
     when histograms are not configured.  Currently it shows that they
     fail the test, when they should state that they are unsupported.
     This bug was added in the 4.7 merge window with the addition of the
     historgram code"

* tag 'trace-v4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Fix hist unsupported result in hist selftests
  tracing: Handle NULL formats in hold_module_trace_bprintk_format()
---

f780f00d723d991353b2a97a8a844ffefbc40505