Merge tag 'v4.2-rc1' into patchwork