Merge branch 'perf/urgent'

diff --cc kernel/events/core.c
Simple merge

diff --cc tools/perf/util/evsel.c
index ec0cc1e21c626e3617820039e7a9df4ca60f43eb,9f1ef9bee2d0c96583dac31d4c12bcc220b519bf..3a334f0019979e88ed8fbaa152f2183470c973f5
--- 1/tools/perf/util/evsel.c
--- 2/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@@ -678,12 -678,8 +678,11 @@@ void perf_evsel__config(struct perf_evs
                attr->sample_type       |= PERF_SAMPLE_WEIGHT;
  
        attr->mmap  = track;
-       attr->mmap2 = track && !perf_missing_features.mmap2;
        attr->comm  = track;
  
 +      if (opts->sample_transaction)
 +              attr->sample_type       |= PERF_SAMPLE_TRANSACTION;
 +
        /*
         * XXX see the function comment above
         *