From: Arnd Bergmann Date: Fri, 16 Jul 2021 20:50:56 +0000 (+0200) Subject: Merge tag 'memory-controller-drv-tegra-5.14-3' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.14-rc2~5^2~13 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6e473d1e21262290b8e1a023eff9f091ab8041b;p=tomoyo%2Ftomoyo-test1.git Merge tag 'memory-controller-drv-tegra-5.14-3' of git://git./linux/kernel/git/krzk/linux-mem-ctrl into arm/fixes Memory controller drivers for v5.14 - Tegra SoC, late fixes Two fixes for recent series of changes in Tegra SoC memory controller drivers: 1. Add a stub for tegra_mc_probe_device() to fix compile testing of arm-smmu without TEGRA_MC. 2. Fix arm-smmu dtschema syntax. * tag 'memory-controller-drv-tegra-5.14-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl: dt-bindings: arm-smmu: Fix json-schema syntax memory: tegra: Add compile-test stub for tegra_mc_probe_device() Link: https://lore.kernel.org/r/20210625073604.13562-1-krzysztof.kozlowski@canonical.com Signed-off-by: Arnd Bergmann --- b6e473d1e21262290b8e1a023eff9f091ab8041b