Merge branch 'mainline' into upstream-linus