Merge branch 'for-4.12/upstream-fixes' into for-linus