From: Olof Johansson Date: Sat, 5 Jun 2021 22:39:22 +0000 (-0700) Subject: Merge tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: xarray-5.18~1771^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3091a9e74240e296cbf657bb7ff6bdb7c33720f0;p=users%2Fwilly%2Fxarray.git Merge tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes Amlogic fixes for v5.13-rc1 - arm64: meson: select COMMON_CLK to select a proper implementation of the clock API - soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe() * tag 'amlogic-fixes-v5.13-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: meson: select COMMON_CLK soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe() Link: https://lore.kernel.org/r/73e76706-f3f4-bebf-10dd-d2ec9106a234@baylibre.com Signed-off-by: Olof Johansson --- 3091a9e74240e296cbf657bb7ff6bdb7c33720f0