Merge tag 'v5.14-rc5' into android-mainline

Linux 5.14-rc5

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If7a0d687213a5b75839f83341f9eb6871e87b55e
This commit is contained in:
Greg Kroah-Hartman
2021-08-09 08:39:57 +02:00
271 changed files with 2503 additions and 1073 deletions

View File

@@ -9136,8 +9136,10 @@ static int trace_array_create_dir(struct trace_array *tr)
return -EINVAL;
ret = event_trace_add_tracer(tr->dir, tr);
if (ret)
if (ret) {
tracefs_remove(tr->dir);
return ret;
}
init_tracer_tracefs(tr, tr->dir);
__update_tracer_options(tr);