Merge branch 'linus' into irq/core

Get the urgent fixes from upstream to avoid conflicts.