]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
tools/build/feature/Makefile patch | diff1 | diff2 | blob | history
tools/include/uapi/linux/perf_event.h patch | diff1 | diff2 | blob | history

diff --cc tools/build/feature/Makefile
Simple merge
diff --cc tools/include/uapi/linux/perf_event.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.