From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Dec 2014 04:03:45 +0000 (-0800)
Subject: Merge tag 'ftracetest-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v4.14-rc1~6350
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c32809521de5b31699a33379183848b0c7628f28;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'ftracetest-3.19' of git://git./linux/kernel/git/rostedt/linux-trace

Pull ftrace self-test updates from Steven Rostedt:
 "Updates for the ftrace self tests:

   - Added kprobes on ftrace testcase
   - Sort test cases
   - Add file to hold helper functions
   - Use logfile name supported by busybox's mktemp
   - Clear trace buffer after running kprobe test
   - Fix show descriptions when run on dash shell
   - Add --verbose option for showing echo output"

* tag 'ftracetest-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Add --verbose option for showing echo output
  ftracetest: Fix to show descriptions on dash
  ftracetest: Add basic event tracing test cases
  ftracetest: Clear trace buffer after running kprobe testcases
  ftracetest: Use logfile name supported by busybox's mktemp
  ftracetest: Add a couple of ftrace test cases
  ftracetest: Add functions file that holds helper functions
  ftracetest: Sort testcases
  ftracetest: Add kprobes on ftrace testcase
---

c32809521de5b31699a33379183848b0c7628f28