Merge branch 'linus' into irq/core, to fix conflict