Merge branch 'topic/sc6000' into for-linus