Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes