From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2014 11:33:37 +0000 (-0400)
Subject: Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v3.18-rc1~82
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=90eac7eee2f4257644dcfb9d22348fded7c24afd;p=linux-2.6-block.git

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

Pull ftrace test code from Steven Rostedt:
 "This patch series starts a new selftests section in the
  tools/testing/selftest directory called "ftrace" that holds tests
  aimed at testing ftrace and subsystems that use ftrace (like kprobes).

  So far only a few tests were written (by Masami Hiramatsu), but more
  will be added in the near future (3.19)"

* tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/kprobes: Add selftest scripts testing kprobe-tracer as startup test
  ftracetest: Add POSIX.3 standard and XFAIL result codes
  ftracetest: Add kprobe basic testcases
  ftracetest: Add ftrace basic testcases
  ftracetest: Initial commit for ftracetest
---

90eac7eee2f4257644dcfb9d22348fded7c24afd