Merge branch 'linus' into x86/asm, to resolve conflicts