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