From 4b9a8b10ed8ad46e6409b935af5bced37dc54b74 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Thu, 8 Apr 2021 22:18:33 +0200 Subject: [PATCH] soc: document merges Signed-off-by: Arnd Bergmann --- arch/arm/arm-soc-for-next-contents.txt | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/arm/arm-soc-for-next-contents.txt b/arch/arm/arm-soc-for-next-contents.txt index f2f20ec6ca30..89f12aed3e62 100644 --- a/arch/arm/arm-soc-for-next-contents.txt +++ b/arch/arm/arm-soc-for-next-contents.txt @@ -8,6 +8,12 @@ arm/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 + hisilicon/soc + git://github.com/hisilicon/linux-hisi tags/hisi-armv7soc-for-5.13 + omap/soc + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/soc-signed + samsung/soc + git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux tags/samsung-soc-5.13 arm/dt renesas/dt @@ -72,13 +78,17 @@ arm/dt git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux tags/samsung-dt64-5.13 at91/dt git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux tags/at91-dt-5.13 + mvebu/dt + git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu tags/mvebu-dt-5.13-1 + patch + ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC 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 - (7ccdcaace80810175bd20b2ece856b42edd43991) + drivers/optee-fix 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 @@ -122,10 +132,14 @@ arm/defconfig git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux tags/imx-defconfig-5.13 patch ARM: configs: Remove REGULATOR_USERSPACE_CONSUMER - (f6dc45610879f88b1c37c07c8342f6764bcd55f4) + mediatek/defconfig 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 + qcom/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-arm64-defconfig-for-5.13 + omap/defconfig + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.13/defconfig-signed arm/newsoc @@ -136,4 +150,12 @@ arm/fixes git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux tags/sunxi-fixes-for-5.12-1 (0c9fdcdba68208270ae85d39600ea97da1718344) git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux tags/qcom-drivers-fixes-for-5.12 + (fc85dc42a38405099f97aa2af709fe9504a82508) + git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v5.12/fixes-rc6-signed + +arm/apple-m1 + apple/m1-dependency + Merge branch 'apple/m1-dependency' into arm/apple-m1 + apple/m1-main + https://github.com/AsahiLinux/linux tags/m1-soc-bringup-v5 -- 2.50.1