commit 9bd871df56a752029b07dde326d799648994b992
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Oct 18 07:29:05 2018 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Oct 18 07:29:05 2018 +0200
tree ce407ad9aec3e77792dc8692d5e5e93dba07f54c
parent c343db455eb3105f11bb5ac290d77ab2006b0209
parent 12ad0cb2123aed30241a14792ef5bef9efcccbcd

Merge tag 'trace-v4.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Steven writes:
  "tracing: Two fixes for 4.19

   This fixes two bugs:
    - Fix size mismatch of tracepoint array
    - Have preemptirq test module use same clock source of the selftest"

* tag 'trace-v4.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Use trace_clock_local() for looping in preemptirq_delay_test.c
  tracepoint: Fix tracepoint array element size mismatch