Merge branch 'core/printk' into tracing/ftrace