Merge branch 'topic/misc' into for-linus