Merge branch 'linus' into perf/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/s390/kernel/perf_cpum_cf.c
index cb774ff6e749070cefc5250fddfb45bf8d4c260d,a9563409c36ea7bc37bfb405411b9c6ac70c2a50..929c147e07b40c19370e621a4ba96e99c13a994e
--- 1/arch/s390/kernel/perf_cpum_cf.c
--- 2/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@@ -536,9 -538,9 +540,9 @@@ static int cpumf_pmu_add(struct perf_ev
         * For group events transaction, the authorization check is
         * done in cpumf_pmu_commit_txn().
         */
 -      if (!(cpuhw->flags & PERF_EVENT_TXN))
 +      if (!(cpuhw->txn_flags & PERF_PMU_TXN_ADD))
                if (validate_ctr_auth(&event->hw))
-                       return -EPERM;
+                       return -ENOENT;
  
        ctr_set_enable(&cpuhw->state, event->hw.config_base);
        event->hw.state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
@@@ -636,9 -615,9 +640,9 @@@ static int cpumf_pmu_commit_txn(struct 
        state = cpuhw->state & ~((1 << CPUMF_LCCTL_ENABLE_SHIFT) - 1);
        state >>= CPUMF_LCCTL_ENABLE_SHIFT;
        if ((state & cpuhw->info.auth_ctl) != state)
-               return -EPERM;
+               return -ENOENT;
  
 -      cpuhw->flags &= ~PERF_EVENT_TXN;
 +      cpuhw->txn_flags = 0;
        perf_pmu_enable(pmu);
        return 0;
  }

diff --cc tools/perf/util/probe-event.c
Simple merge