Merge branch 'linus' into irq/core

Pick up upstream fixes to avoid conflicts with pending patches.