summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-24 00:23:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-24 00:23:28 +0200
commit81f9c4e4177d31ced6f52a89bb70e93bfb77ca03 (patch)
tree2c9130e553e1321e5533a5c04a55442964390bdb /drivers
parentMerge tag 'powerpc-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff)
parenttracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount (diff)
downloadlinux-81f9c4e4177d31ced6f52a89bb70e93bfb77ca03.tar.xz
linux-81f9c4e4177d31ced6f52a89bb70e93bfb77ca03.zip
Merge tag 'trace-v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "This contains a few fixes and a clean up. - a bad merge caused an "endif" to go in the wrong place in scripts/Makefile.build - softirq tracing fix for tracing that corrupts lockdep and causes a false splat - histogram documentation typo fixes - fix a bad memory reference when passing in no filter to the filter code - simplify code by using the swap macro instead of open coding the swap" * tag 'trace-v4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount tracing: Fix some errors in histogram documentation tracing: Use swap macro in update_max_tr softirq: Reorder trace_softirqs_on to prevent lockdep splat tracing: Check for no filter when processing event filters
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions