Merge branch 'linus' into sfi-release