soc: document merges

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 0b362f4546a9b525efd60235cdedea326e4eab94,0000000000000000000000000000000000000000..4fa9b07f716a30134a138ce3df7e07eda86f3367
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,88 -1,0 +1,109 @@@
-       drivers/rpi-firmware
- drivers/rpi-poe
 +arm/soc
++      patch
++              ARM: ux500: make ux500_cpu_die static
++      omap/cleanup
++              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/genpd-cleanup-signed
++              contains omap/dt
++      imx/soc
++              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-soc-5.13
++      at91/soc
++              git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-soc-5.13
 +
 +arm/dt
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-arm-dt-for-v5.13-tag1
 +      patch
 +              ARM: mstar: Select MSTAR_MSC313_MPLL
 +              ARM: mstar: Add the external clocks to the base dsti
 +              ARM: mstar: Add mpll to base dtsi
 +      omap/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/dts-genpd-signed
 +      socfpga/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux tags/socfpga_dts_update_for_v5.13
 +      broadcom/dt
 +              https://github.com/Broadcom/stblinux tags/arm-soc/for-5.13/devicetree
 +      broadcom/dt64
 +              https://github.com/Broadcom/stblinux tags/arm-soc/for-5.13/devicetre-arm64
 +      imx/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-bindgins-5.13
 +      <no branch> (45b78dd39f04f6198f8e2e9fe9d155a5e8326aab)
 +              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-dt-5.13
 +      imx/dt64
 +              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-dt64-5.13
 +      juno/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux tags/juno-updates-5.13
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ux500-dts-v5.13
 +      stm32/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 tags/stm32-dt-for-v5.13-1
 +      tegra/dt-bindings
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.13-dt-bindings
 +      tegra/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.13-arm-dt
 +      tegra/dt64
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.13-arm64-dt
 +      mediatek/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.12-next-dts32
 +      mediatek/dt64
 +              git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.12-next-dts64
 +
 +arm/drivers
 +      drivers/tee
 +              git://git.linaro.org/people/jens.wiklander/linux-tee tags/optee-tracepoints-for-v5.13
 +      renesas/drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-drivers-for-v5.13-tag1
 +      <no branch> (7ccdcaace80810175bd20b2ece856b42edd43991)
 +              git://git.linaro.org/people/jens.wiklander/linux-tee tags/optee-tracepoints-fix-for-v5.13
++      drivers/rpi-poe
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi tags/rpi-poe-v5.13
 +      omap/drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/ti-sysc-signed
 +      drivers/optee-memref
 +              git://git.linaro.org/people/jens.wiklander/linux-tee tags/optee-memref-size-for-v5.13
 +      broadcom/drivers
 +              https://github.com/Broadcom/stblinux tags/arm-soc/for-5.13/drivers
 +      imx/drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-drivers-5.13
 +      tegra/clk
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.13-clk
 +      tegra/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.13-soc
 +      mediatek/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.12-next-soc
 +      socfpga/rename
 +              git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux tags/socfpga_update_for_v5.13
 +
 +arm/defconfig
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-arm-defconfig-for-v5.13-tag1
++      patch
++              ARM: configs: ux500: Update for new drivers
++      socfpga/defconfig
++              git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux tags/arm64_defconfig_for_v5.13
++      imx/defconfig
++              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-defconfig-5.13
++      patch
++              ARM: configs: Remove REGULATOR_USERSPACE_CONSUMER
++      <no branch> (f6dc45610879f88b1c37c07c8342f6764bcd55f4)
++              git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.12-next-defconfig
++      at91/defconfig
++              git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-defconfig-5.13
 +
 +arm/newsoc
 +
 +arm/late
 +
 +arm/fixes
 +      <no branch> (443f0bb8e29fa031ec4d5beb3c3143350438dc97)
 +              https://github.com/Broadcom/stblinux tags/arm-soc/for-5.12/devicetree-part2
 +      <no branch> (b3d09a06d89f474cb52664e016849315a97e09d9)
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.12/fixes-rc4-signed
 +      <no branch> (f57011e72f5fe0421ec7a812beb1b57bdf4bb47f)
 +              git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-fixes-5.12-2
 +      patch
 +              ARM: keystone: fix integer overflow warning
 +              soc/fsl: qbman: fix conflicting alignment attributes
 +              ARM: omap1: fix building with clang IAS
 +              ARM: pxa: mainstone: avoid -Woverride-init warning
 +              ARM: mvebu: avoid clang -Wtautological-constant warning
++

diff --cc arch/arm/mach-omap2/pdata-quirks.c
Simple merge

diff --cc drivers/bus/ti-sysc.c
Simple merge