From: Catalin Marinas <catalin.marinas@arm.com>
Date: Thu, 31 May 2018 17:09:38 +0000 (+0100)
Subject: Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will... 
X-Git-Tag: v4.18-rc1~87^2~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cb877710e58f7266215fbf2d51516c9fc6993019;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux

- perf/arm-cci: allow building as module

- perf/arm-ccn: demote dev_warn() to dev_dbg() in event_init()

- miscellaneous perf/arm cleanups

* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  ARM: mcpm, perf/arm-cci: export mcpm_is_available
  drivers/bus: arm-cci: fix build warnings
  drivers/perf: Remove ARM_SPE_PMU explicit PERF_EVENTS dependency
  drivers/perf: arm-ccn: don't log to dmesg in event_init
  perf/arm-cci: Allow building as a module
  perf/arm-cci: Remove pointless PMU disabling
  perf/arm-cc*: Fix MODULE_LICENSE() tags
  arm_pmu: simplify arm_pmu::handle_irq
  perf/arm-cci: Remove unnecessary period adjustment
  perf: simplify getting .drvdata
---

cb877710e58f7266215fbf2d51516c9fc6993019