Merge branch 'topic/pcm-oss-fix' into for-linus