Merge branches 'sh/ftrace' and 'sh/stable-updates'