Merge branch 'linus' into x86/asm, before applying dependent patch