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:Arnaldo Carvalho de Melo <acme@redhat.com>
Loading
Please register or sign in to comment