Merge branch 'debian-enable-arm-cci-pmu' of https://salsa.debian.org/hrw-guest/linux into sid

debian/changelog

@@ -98,6 +98,10 @@ linux (4.19.17-1) UNRELEASED; urgency=medium
   * [i386] debian/control: Fix cross-compiler build-dependency
   * debian/README.source: Document how to run kconfigeditor2
 
+  [ Marcin Juszkiewicz ]
+  * [arm64] enable ARM_CCI_PMU so ARM_CCI400_PMU and ARM_CCI5xx_PMU options
+    get really enabled.
+
  -- Luca Boccassi <bluca@debian.org>  Fri, 18 Jan 2019 19:09:06 +0000
 
 linux (4.19.16-1) unstable; urgency=medium

debian/config/arm64/config

@@ -740,6 +740,7 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 ##
 ## file: drivers/perf/Kconfig
 ##
+CONFIG_ARM_CCI_PMU=y
 CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
 CONFIG_ARM_CCN=y