Merge branch 'perf/nmi' into perf/core