Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes