linux-next: manual merge of the arm-soc tree with the origin tree

[Mark Brown]

Hi all,

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

  drivers/soc/Kconfig
  drivers/soc/Makefile

between commit:

  2e51c645fee24 ("Merge tag 'soc-drivers-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc")

from the origin tree and commit:

  3cd9904284fba ("Merge branch 'soc/drivers' into for-next")

from the arm-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 --combined drivers/soc/Kconfig
index 483cbdcae1534,be933b2d9c32a..0000000000000
--- a/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -24,8 -24,8 +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/starfive/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 --combined drivers/soc/Makefile
index 5a3efd68355cd,5bedcf8d513c4..0000000000000
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@@ -30,8 -30,8 +30,8 @@@ obj-y				+= renesas
  obj-y				+= rockchip/
  obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/
  obj-y				+= sophgo/
 -obj-y				+= starfive/
  obj-y				+= st/
 +obj-y				+= starfive/
  obj-y				+= sunxi/
  obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
  obj-y				+= ti/

Attachment: signature.asc
Description: PGP signature