From: Will Deacon <will@kernel.org>
Date: Mon, 25 Jul 2022 09:57:14 +0000 (+0100)
Subject: Merge branch 'for-next/perf' into for-next/core
X-Git-Tag: v6.0-rc1~203^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=288e21b6b21c15666f0b03c9f51c8a113a985eb9;p=thirdparty%2Flinux.git

Merge branch 'for-next/perf' into for-next/core

* for-next/perf:
  drivers/perf: arm_spe: Fix consistency of SYS_PMSCR_EL1.CX
  perf: RISC-V: Add of_node_put() when breaking out of for_each_of_cpu_node()
  docs: perf: Include hns3-pmu.rst in toctree to fix 'htmldocs' WARNING
  drivers/perf: hisi: add driver for HNS3 PMU
  drivers/perf: hisi: Add description for HNS3 PMU driver
  drivers/perf: riscv_pmu_sbi: perf format
  perf/arm-cci: Use the bitmap API to allocate bitmaps
  drivers/perf: riscv_pmu: Add riscv pmu pm notifier
  perf: hisi: Extract hisi_pmu_init
  perf/marvell_cn10k: Fix TAD PMU register offset
  perf/marvell_cn10k: Remove useless license text when SPDX-License-Identifier is already used
  arm64: cpufeature: Allow different PMU versions in ID_DFR0_EL1
  perf/arm-cci: fix typo in comment
  drivers/perf:Directly use ida_alloc()/free()
  drivers/perf: Directly use ida_alloc()/free()
---

288e21b6b21c15666f0b03c9f51c8a113a985eb9