From: Arnd Bergmann Date: Mon, 3 Apr 2023 15:51:09 +0000 (+0200) Subject: Merge tag 'amlogic-fixes-v6.3-rc' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v6.6.17~5130^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0311454f4f2effef609499219a75c70ae21cccc5;p=platform%2Fkernel%2Flinux-rpi.git 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 --- 0311454f4f2effef609499219a75c70ae21cccc5