Merge branch 'topic/sh' into for-linus