Merge commit 'tip/tracing/core' into oprofile/core