Merge branch 'for-6.4/amd-sfh' into for-linus