Merge tag 'v3.12-rc3' into irq/core