git.maquefel.me Git - linux.git/commit

author	Arnaldo Carvalho de Melo <acme@redhat.com>
	Mon, 18 Jul 2022 13:36:11 +0000 (10:36 -0300)
committer	Arnaldo Carvalho de Melo <acme@redhat.com>
	Mon, 18 Jul 2022 13:36:11 +0000 (10:36 -0300)
commit	0698461ad2984892a47582a58eb235488d3aac7f
tree	107cfefee20b50f79cde3ed847f075bdbf50fad0	tree \| snapshot
parent	0d2997f750d1de394231bc22768dab94a5b5db2f	commit \| diff
parent	ff6992735ade75aae3e35d16b17da1008d753d28	commit \| diff

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

To update the perf/core codebase.

Fix conflict by moving arch__post_evsel_config(evsel, attr) to the end
of evsel__config(), after what was added in:

49c692b7dfc9b6c0 ("perf offcpu: Accept allowed sample types only")

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

tools/perf/builtin-inject.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evsel.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/header.c	diff1 \|	diff2 \|	blob \| history
tools/perf/util/header.h	diff1 \|	diff2 \|	blob \| history
tools/perf/util/synthetic-events.c	diff1 \|	diff2 \|	blob \| history