Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits