Merge branch 'linus' into out-of-tree