Merge branch 'misc' into for-linus