Merge branch 'linus' into x86/cleanups

Pull in upstream changes so we can apply depending patches.