Merge branches 'perf-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel...