Subject: linux-next: manual merge of the arm-soc tree with the samsung-krzk-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Apr 2022 09:42:53 +1000

Hi all,

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

  arch/arm/Kconfig

between commit:

  436ce66003d5 ("ARM: s3c: mark as deprecated and schedule removal")

from the samsung-krzk-fixes tree and commit:

  8c1fb11b8a77 ("ARM: s3c: enable s3c24xx multiplatform support")

from the arm-soc tree.

I fixed it up (I used the latter version of this file and added the
following merge fix patch) 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.

From: Stephen Rothwell <[email-masked]>
Date: Wed, 20 Apr 2022 09:38:18 +1000
Subject: [PATCH] fixup for "ARM: s3c: mark as deprecated and schedule removal"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 arch/arm/mach-s3c/Kconfig.s3c24xx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-s3c/Kconfig.s3c24xx b/arch/arm/mach-s3c/Kconfig.s3c24xx
index d7dc031abc7a..f151a6f6d89e 100644
--- a/arch/arm/mach-s3c/Kconfig.s3c24xx
+++ b/arch/arm/mach-s3c/Kconfig.s3c24xx
@@ -6,7 +6,7 @@
 # Copyright 2007 Simtec Electronics
 
 menuconfig ARCH_S3C24XX
-	bool "Samsung S3C24XX SoCs"
+	bool "Samsung S3C24XX SoCs (deprecated, see help)"
 	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5
 	depends on CPU_LITTLE_ENDIAN
 	select ATAGS
@@ -22,6 +22,11 @@ menuconfig ARCH_S3C24XX
 	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
 	  Samsung SMDK2410 development board (and derivatives).
 
+	  The platform is deprecated and scheduled for removal. Please reach to
+	  the maintainers of the platform and [email-masked] if
+	  you still use it.
+	  Without such feedback, the platform will be removed after 2022.
+
 if ARCH_S3C24XX
 
 config PLAT_S3C24XX
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell