Merge branch 'irq/for-x86' into irq/core

Pull in the branch which can be consumed by x86 to build their changes
on top.