Merge branches 'tracing/hw-branch-tracing' and 'tracing/branch-tracer' into tracing/core