Merge branch into tip/master: 'perf/merge'

Merge branch into tip/master: 'perf/merge'

 # New commits in perf/merge:
    2492e5aba2be ("perf/x86/amd/uncore: Prevent UMC counters from saturating")
    e1ed37b70fb3 ("perf/x86/amd/uncore: Add parameter to configure hrtimer")
    6d937e044bc9 ("perf/x86/amd/uncore: Use hrtimer for handling overflows")
    05c9b0cbe4b8 ("perf/x86/intel/uncore: Use HRTIMER_MODE_HARD for detecting overflows")
    4f81cc2d1bf9 ("perf/x86/amd/uncore: Remove unused 'struct amd_uncore_ctx::node' member")
    fe8e5a3215cc ("selftests/bpf: Add 5-byte NOP uprobe trigger benchmark")
    610f6e14c29d ("uprobes/x86: Add support to emulate NOP instructions")

Signed-off-by: Ingo Molnar <mingo@kernel.org>