From: Arnaldo Carvalho de Melo Date: Thu, 6 Aug 2020 11:15:47 +0000 (-0300) Subject: Mgerge remote-tracking branch 'torvalds/master' into perf/core X-Git-Tag: v5.15~3130^2~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94fb1afb14c4f0ceb8c5508ddddac6819f662e95;p=platform%2Fkernel%2Flinux-starfive.git Mgerge remote-tracking branch 'torvalds/master' into perf/core To sync headers, for instance, in this case tools/perf was ahead of upstream till Linus merged tip/perf/core to get the PERF_RECORD_TEXT_POKE changes: Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h' differs from latest version at 'include/uapi/linux/perf_event.h' diff -u tools/include/uapi/linux/perf_event.h include/uapi/linux/perf_event.h Signed-off-by: Arnaldo Carvalho de Melo --- 94fb1afb14c4f0ceb8c5508ddddac6819f662e95