Merge branch 'upstream-fixes' into for-linus