Linus,
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
Please pull the latest trace-v4.18-rc1 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v4.18-rc1
Tag SHA1: 50d890b32aae88f43b04fe477d9a00db564e78e9
Head SHA1: ed7d40bc67b8353c677b38c6cdddcdc310c0f452
Greg Thelen (1):
tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with
-mrecord-mcount
Gustavo A. R. Silva (1):
tracing: Use swap macro in update_max_tr
Joel Fernandes (Google) (2):
softirq: Reorder trace_softirqs_on to prevent lockdep splat
tracing: Fix some errors in histogram documentation
Steven Rostedt (VMware) (1):
tracing: Check for no filter when processing event filters
----
Documentation/trace/histogram.txt | 23 ++++++++++++-----------
kernel/softirq.c | 6 +++++-
kernel/trace/trace.c | 6 +-----
kernel/trace/trace_events_filter.c | 10 +++++++++-
scripts/Makefile.build | 2 +-
5 files changed, 28 insertions(+), 19 deletions(-)
