Learn more about cloning repositories
You have read-only access
Merge branch 'tracing/urgent' into tracing/ftrace Conflicts: kernel/trace/trace.c