commit | 94fb1afb14c4f0ceb8c5508ddddac6819f662e95 | [log] [tgz] |
---|---|---|
author | Arnaldo Carvalho de Melo <acme@redhat.com> | Thu Aug 06 08:15:47 2020 -0300 |
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | Thu Aug 06 08:15:47 2020 -0300 |
tree | 4988e5769dc7482caa7f441475ae31f50bbd37ef | |
parent | c4735d990268399da9133b0ad445e488ece009ad [diff] | |
parent | 47ec5303d73ea344e84f46660fff693c57641386 [diff] |
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 <acme@redhat.com>