soc: document merges

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt
index 0abe29a615ee5564de50c5c71a79a854ed94e45f..1495819c71bd86ed1a0926a1447395d9eaf4c921 100644 (file)
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -44,6 +44,22 @@ arm/dt
                git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux tags/samsung-dt64-5.15
        omap/cpsw-dt
                git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/dt-am3-signed
+       renesas/dt-2
+               git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-arm-dt-for-v5.15-tag2
+       amlogic/dt-2
+               git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux tags/amlogic-arm64-dt-for-v5.15-v2
+       tegra/dt-bindings
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.15-dt-bindings
+       tegra/dt
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.15-arm-dt
+       tegra/dt64
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.15-arm64-dt
+       imx/dt
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-bindings-5.15
+       imx/dt64
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-dt64-5.15
+       imx/dt-2
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-dt-5.15
 
 arm/drivers
        renesas/driver
@@ -64,14 +80,18 @@ arm/drivers
                git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone tags/drivers_soc_for_5.15
        drivers/scmi
                git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux tags/scmi-updates-5.15
-       omap/smartreflex
-               git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/sr-signed
 
 arm/defconfig
        at91/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-defconfig-5.15
        amlogic/defconfig
                git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux tags/amlogic-arm-configs-for-v5.15
+       tegra/defconfig
+               git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.15-arm-defconfig
+       imx/defconfig
+               git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-defconfig-5.15
+       qcom/defconfig
+               git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-defconfig-for-5.15
 
 arm/newsoc
 
@@ -81,4 +101,8 @@ arm/fixes
        patch
                ARM: configs: Update the nhk8815_defconfig
                ARM: ixp4xx: fix building both pci drivers
+       <no branch> (c1e64c0aec8cb0499e61af7ea086b59abba97945)
+               git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux tags/soc-fsl-fix-v5.14
+       <no branch> (d77c95bf9a64d8620662151b2b10efd8221f4bcc)
+               git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-fixes-for-5.14