Merge branch 'core/locking' into tracing/ftrace