Merge branch 'linus' into irq/core

Bring in upstream updates for patches which depend on them