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