Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus