Skip to content
Commit 0698461a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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:

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

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 0d2997f7 ff699273
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment