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