Merge tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 02:30:30 +0000 (19:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 02:30:30 +0000 (19:30 -0700)
commit4496a1d9638644484d0d99e9de63742248f3c119
tree12be3c6029a8973a4315a02c0835bc63dc5b1525
parentd6542d76ec88dde3305b06c03952d87b15bbc292
parent97f8827a8c7963756ae7d3ee898675b4667eca73
Merge tag 'trace-v4.7-3' of git://git./linux/kernel/git/rostedt/linux-trace

Pull tracing fix from Steven Rostedt:
 "Reviewing the selftest I recently submitted, I realize that the second
  part of it uses my old hack to get the PID of the spawned background
  tasks, which doesn't work for all shells, instead of the common use of
  $!"

* tag 'trace-v4.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Use proper logic to find process PID