Merge branch 'for-6.1/amd_sfh' into for-linus