Merge branch 'upstream' into for-linus