Merge branch 'from-linus' into upstream