Merge branch 'topic/pcm-mmap-cleanup' into for-next