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>

diff --cc tools/perf/builtin-inject.c
Simple merge

diff --cc tools/perf/util/evsel.c
index 8fea51a9cd90eb0ea86d2eee2d12bb8c3ce86996,094b0a9c0bc0f63e78e386fada1c6d4c00204a10..a67cc3f2fa74432a5d986e665e877480d4539923
--- 1/tools/perf/util/evsel.c
--- 2/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -1372,7 -1373,8 +1378,10 @@@ void evsel__config(struct evsel *evsel
        if (evsel__is_dummy_event(evsel))
                evsel__reset_sample_bit(evsel, BRANCH_STACK);
  
+       if (evsel__is_offcpu_event(evsel))
+               evsel->core.attr.sample_type &= OFFCPU_SAMPLE_TYPES;
++
 +      arch__post_evsel_config(evsel, attr);
  }
  
  int evsel__set_filter(struct evsel *evsel, const char *filter)

diff --cc tools/perf/util/header.c
Simple merge

diff --cc tools/perf/util/header.h
Simple merge

diff --cc tools/perf/util/synthetic-events.c
Simple merge