Merge branch 'sh/urgent' into sh-fixes-for-linus