Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts