Merge branch 'fix/pcm-hwptr' into for-linus