Merge branch 'linus' into x86/urgent

Required to queue a dependent fix.