]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f693dac 09688c0)
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 14 Mar 2022 22:15:16 +0000 (19:15 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 14 Mar 2022 22:15:16 +0000 (19:15 -0300)
To pick up fixes that went thru perf/urgent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1  2 
tools/perf/builtin-script.c patch | diff1 | diff2 | blob | history
tools/perf/util/data.c patch | diff1 | diff2 | blob | history

diff --cc tools/perf/builtin-script.c
Simple merge
diff --cc tools/perf/util/data.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.