linux-next: manual merge of the ftrace tree with the tip tree

Hi all, Today's linux-next merge of the ftrace tree got a conflict in: arch/x86/kernel/kprobes/ftrace.c between commit: d9f6e12fb0b7 ("x86: Fix various typos in comments") from the tip tree and commit: e0196ae73234 ("ftrace: Fix spelling mistake "disabed" -> "disabled"") from the ftrac

linux-next: manual merge of the ftrace tree with the tip tree

Hi Steven, Today's linux-next merge of the ftrace tree got conflicts in: include/linux/ftrace.h kernel/trace/trace_functions_graph.c between commit: daa460a88c09 ("ftrace: Only allocate the ret_stack 'fp' field when needed") from the tip tree and commit: 8861dd303cba ("ftrace: Access