Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/x86/include/asm/ftrace.h
Simple merge

diff --cc arch/x86/kernel/ftrace.c
Simple merge

diff --cc arch/x86/kernel/traps.c
Simple merge

diff --cc fs/xfs/xfs_trace.h
Simple merge

diff --cc include/linux/module.h
Simple merge

diff --cc include/linux/trace_events.h
Simple merge

diff --cc include/trace/trace_events.h
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_events.c
Simple merge

diff --cc kernel/trace/trace_events_hist.c
Simple merge

diff --cc kernel/trace/trace_export.c
index 6d64c1c19fd54bf2ff34dd7b744009473e20073f,2e6d2e9741cc7f0d165abc9ed314301aedd44a02..77ce5a3b6773e75ff2a117e0913b3588b1cfa529
--- 1/kernel/trace/trace_export.c
--- 2/kernel/trace/trace_export.c
+++ b/kernel/trace/trace_export.c
@@@ -142,10 -168,12 +142,10 @@@ static struct trace_event_fields ftrace
  #define F_printk(fmt, args...) __stringify(fmt) ", "  __stringify(args)
  
  #undef FTRACE_ENTRY_REG
 -#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
 -                       regfn)                                         \
 -                                                                      \
 +#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, regfn) \
- struct trace_event_class __refdata event_class_ftrace_##call = {      \
+ static struct trace_event_class __refdata event_class_ftrace_##call = {       \
        .system                 = __stringify(TRACE_SYSTEM),            \
 -      .define_fields          = ftrace_define_fields_##call,          \
 +      .fields_array           = ftrace_event_fields_##call,           \
        .fields                 = LIST_HEAD_INIT(event_class_ftrace_##call.fields),\
        .reg                    = regfn,                                \
  };                                                                    \

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc kernel/trace/trace_syscalls.c
Simple merge