Merge branch 'barrier' into for-linus