Merge branch 'sglist-arch' into for-linus