Merge branch 'linus' into perf/core, to fix conflicts