Merge branches 'sh/ftrace' and 'sh/cachetlb'