linux-next: manual merge of the riscv-soc tree with the stm32 tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

Hi all,

Today's linux-next merge of the riscv-soc tree got conflicts in:

  drivers/soc/Kconfig
  drivers/soc/Makefile

between commit:

  f831584128ac2 ("soc: st: Add STM32MP2 SYSCFG driver")

from the stm32 tree and commit:

  96b35a1251dc9 ("soc: starfive: Add socinfo driver for JHB100 SoC")

from the riscv-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc drivers/soc/Kconfig
index dfe5cec592626,b3b01fc38139d..0000000000000
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -24,7 -24,7 +24,8 @@@ source "drivers/soc/renesas/Kconfig
  source "drivers/soc/rockchip/Kconfig"
  source "drivers/soc/samsung/Kconfig"
  source "drivers/soc/sophgo/Kconfig"
 +source "drivers/soc/st/Kconfig"
+ source "drivers/soc/starfive/Kconfig"
  source "drivers/soc/sunxi/Kconfig"
  source "drivers/soc/tegra/Kconfig"
  source "drivers/soc/ti/Kconfig"
diff --cc drivers/soc/Makefile
index 6446c854e5611,009f85ff891a1..0000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -29,7 -30,7 +29,8 @@@ obj-y				+= renesas
  obj-y				+= rockchip/
  obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
  obj-y				+= sophgo/
 +obj-y				+= st/
+ obj-y				+= starfive/
  obj-y				+= sunxi/
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
  obj-y				+= ti/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]