Merge branch 'topic/coh' into for-linus