Merge branches 'misc' and 'misc-rc6' into for-linus