Re: [PATCH v6 5/5] tracing: Adopt __free() and guard() for trace_fprobe.c

[Steven Rostedt]

On Thu,  9 Jan 2025 23:30:22 +0900
"Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx> wrote:

> From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
> 
> Adopt __free() and guard() for trace_fprobe.c to remove gotos.
> 
> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
> ---
>  Changes in v6:
>   - Rename trace_fprobe_create* functions.
>   - Rename __free label for trace_fprobe.
>   - Simplify the last part of trace_fprobe_create_internal().
> ---

This conflicts with the changes in my tree. The ones that I pulled in from
you that makes fprobes use function graph.

Care to rebase this patch on top of my ftrace/for-next branch?

Then we don't need to worry about the conflicts.

-- Steve