git.somdevices.com Git - linux.git/commit

author	Arnaldo Carvalho de Melo <acme@redhat.com>
	Wed, 8 Jul 2020 16:49:15 +0000 (13:49 -0300)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Wed, 8 Jul 2020 16:49:15 +0000 (13:49 -0300)
commit	facbf0b9820f34f14b54f567862b4a96e910f468
tree	ee65e875e4167dd903f2745cfbf6b2735fd1cd9e	tree \| snapshot
parent	19bf119ccfa071b73a54465e8082ab2c8f8c30eb	commit \| diff
parent	dcde237b9b0eb1d19306e6f48c0a4e058907619f	commit \| diff

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes and move perf/core forward, minor conflict as
perf_evlist__add_dummy() lost its 'perf_' prefix as it operates on a
'struct evlist', not on a 'struct perf_evlist', i.e. its tools/perf/
specific, it is not in libperf.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

RSS Atom

tools/lib/traceevent/kbuffer.h	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-record.c	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-script.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evlist.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evlist.h	diff1 \|	diff2 \|	blob \| history