From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 12 Aug 2021 21:12:10 +0000 (+0200)
Subject: soc: document merges
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ffc192c8170562be3fd1c0ccbe6001e915d997d7;p=users%2Fjedix%2Flinux-maple.git

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 69236d7ac3aa..0abe29a615ee 100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@ -3,6 +3,10 @@ arm/soc
 		ARM: ep93xx: remove MaverickCrunch support
 	at91/soc
 		git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-soc-5.15
+	omap/soc
+		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/soc-signed
+	omap/soc-late
+		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/soc-late-signed
 
 arm/dt
 	patch
@@ -16,14 +20,58 @@ arm/dt
 		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ux500-dts-v5.15-1
 	at91/dt
 		git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-dt-5.15
+	omap/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/dt-signed
+	sti/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti tags/sti-dt-for-v5.15-round1
+	stm32/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 tags/stm32-dt-for-v5.15-1
+	ixp4xx/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ixp4xx-dts-arm-soc-v5.15-1
+	mediatek/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.14-next-dts32
+	mediatek/dt64
+		git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.14-next-dts64
+	k3/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux tags/ti-k3-dt-for-v5.15
+	amlogic/dt64
+		git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux tags/amlogic-arm64-dt-for-v5.15
+	amlogic/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux tags/amlogic-arm-dt-for-v5.15
+	samsung/dt
+		git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux tags/samsung-dt-5.15
+	samsung/dt64
+		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
 
 arm/drivers
 	renesas/driver
 		git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel tags/renesas-drivers-for-v5.15-tag1
 	ixp4xx/drivers
 		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik tags/ixp4xx-drivers-arm-soc-v5.15-1
+	omap/ti-sysc
+		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.15/ti-sysc-signed
+	patch
+		bus: ixp4xx: return on error in ixp4xx_exp_probe()
+	imx/ecspi
+		git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-ecspi-5.15
+	mediatek/drivers
+		git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux tags/v5.14-next-soc
+	drivers/memory
+		git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl tags/memory-controller-drv-5.15
+	keystone/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
 
 arm/newsoc
 
@@ -31,24 +79,6 @@ arm/late
 
 arm/fixes
 	patch
-		ARM: dts: nomadik: Fix up interrupt controller node names
-	<no branch> (ba02920c51debb9198e72b3a8726a7c5ae4ffb41)
-		git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux tags/tegra-for-5.14-rc3-arm64-dt
-	patch
-		soc/tegra: Make regulator couplers depend on CONFIG_REGULATOR
-		ARM: ixp4xx: fix compile-testing soc drivers
-		ARM: ixp4xx: goramo_mlr depends on old PCI driver
-	<no branch> (3d9e30a52047f2d464efdfd1d561ae1f707a0286)
-		git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-fixes-5.14
-	<no branch> (914ab19e471d8fb535ed50dff108b0a615f3c2d8)
-		git://git.linaro.org:/people/jens.wiklander/linux-tee tags/tee-kexec-fixes-for-v5.14
-	<no branch> (15f68f027ebd961b99a1c420f96ff3838c5e4450)
-		git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 tags/stm32-dt-for-v5.14-fixes-1
-	<no branch> (ee7ab3f263f8131722cff3871b9618b1e7478f07)
-		git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu tags/mvebu-fixes-5.14-1
-	patch
-		soc: ixp4xx: fix printing resources
-		soc: ixp4xx/qmgr: fix invalid __iomem access
-	<no branch> (353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5)
-		git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.14/fixes-rc5-signed
+		ARM: configs: Update the nhk8815_defconfig
+		ARM: ixp4xx: fix building both pci drivers