projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4735d9 47ec530)
Mgerge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 6 Aug 2020 11:15:47 +0000 (08:15 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 6 Aug 2020 11:15:47 +0000 (08:15 -0300)
commit94fb1afb14c4f0ceb8c5508ddddac6819f662e95
tree4988e5769dc7482caa7f441475ae31f50bbd37eftree | snapshot
parentc4735d990268399da9133b0ad445e488ece009adcommit | diff
parent47ec5303d73ea344e84f46660fff693c57641386commit | 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>
tools/build/feature/Makefile diff1 | diff2 | blob | history
tools/include/uapi/linux/perf_event.h diff1 | diff2 | blob | history
MicroBlaze GIT Repository