Merge branch 'linus' into tracing/nmisafe