Merge branch 'for-4.19/fixes' into for-linus