Merge branch 'topic/oss-cleanup' into for-linus