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