Merge branch 'for-4.18/upstream' into for-linus