Andrea Righi (1):
ring-buffer: Set the right timestamp in the slow path of
__rb_reserve_next()
Masami Hiramatsu (4):
tools/bootconfig: Fix errno reference after printf()
tools/bootconfig: Fix to check the write failure correctly
tools/bootconfig: Align the bootconfig applied initrd image size to 4
docs: bootconfig: Update file format on initrd image
Minchan Kim (1):
tracing: Fix alignment of static buffer
Naveen N. Rao (2):
ftrace: Fix updating FTRACE_FL_TRAMP
ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency
Sami Tolvanen (1):
samples/ftrace: Mark my_tramp[12]? global
Steven Rostedt (VMware) (2):
ring-buffer: Update write stamp with the correct ts
ring-buffer: Always check to put back before stamp when crossing pages
Vasily Averin (1):
tracing: Remove WARN_ON in start_thread()
----
Documentation/admin-guide/bootconfig.rst | 18 +++--
include/linux/bootconfig.h | 3 +
kernel/trace/Kconfig | 2 +-
kernel/trace/ftrace.c | 22 +++++-
kernel/trace/ring_buffer.c | 20 +++--
kernel/trace/trace.c | 2 +-
kernel/trace/trace_hwlat.c | 2 +-
samples/ftrace/ftrace-direct-modify.c | 2 +
samples/ftrace/ftrace-direct-too.c | 1 +
samples/ftrace/ftrace-direct.c | 1 +
tools/bootconfig/main.c | 121 ++++++++++++++++++++-----------
tools/bootconfig/test-bootconfig.sh | 6 +-
12 files changed, 138 insertions(+), 62 deletions(-)
