Merge tag 'amlogic-fixes-v6.3-rc' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 3 Apr 2023 15:51:09 +0000 (17:51 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 3 Apr 2023 15:51:10 +0000 (17:51 +0200)
commit0311454f4f2effef609499219a75c70ae21cccc5
treee4e04030ce6475590e2c74b87b4f680cc360b22a
parent167fba62c3774b05351cf05e336d66c40f2d43b5
parentf9d323e7c1724270d747657051099826744e91e7
Merge tag 'amlogic-fixes-v6.3-rc' of https://git./linux/kernel/git/amlogic/linux into arm/fixes

Amlogic fixes for v6.3-rc:
- fix conflicts between DMC memory space and Amlogic perf driver

* tag 'amlogic-fixes-v6.3-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  perf/amlogic: adjust register offsets
  arm64: dts: meson-g12-common: resolve conflict between canvas & pmu
  arm64: dts: meson-g12-common: specify full DMC range

Link: https://lore.kernel.org/r/db5fcdb4-60e8-95e6-06b5-1ac474ecabe3@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>