Merge branch 'topic/oss' into for-linus