Merge tag 'v5.7-rc6' into objtool/core, to pick up fixes and resolve semantic conflict