Merge branch 'linus' into tracing/mmiotrace-mergefixups