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