From patchwork Tue Apr 19 23:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12819509 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AC63C433FE for ; Tue, 19 Apr 2022 23:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=2nPplp1z8vhK/B095QKMQ/3VDKrcBbGNR3IUkzw6gjs=; b=eDI YrDEvrBxBAUTWsCbIfMAg8tenEsF42N5NbgsEHs4g9Hs4451aSnVhNoBTni9fD+14lhgUQicXWiBM 1XOMD2fleEA1mkiUIsZR64oquzeMjTV/UbUzbtjjaiho/7cBDvj3wSdE/6ZZ1TWGYI7a1/K+ueHYl Qhdvb0YefJmpi2wHLHcDXWQvSgjUi7E7QFewY+3+dNge9irsaxF6PcfjiXh/qGVQX/k0ORbMNlyPP 8cXebbgxLNwwf2QigrKBCi7JFiz7k+9ZGQ28D5T1huH/jSpcuCrlHctY4/U0DPk8+SWU5t8hyMZp5 IGb+G1onGT0OPhIeTTyKARcpQcPUZ6g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngxUx-006dSK-N0; Tue, 19 Apr 2022 23:43:07 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ngxUt-006dRQ-Sc for linux-arm-kernel@lists.infradead.org; Tue, 19 Apr 2022 23:43:05 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4KjgMy38VVz4xNm; Wed, 20 Apr 2022 09:42:54 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1650411775; bh=J7MkUMhWQdU5+xYSe/nobBFT2dwUOTLlJX16ZJ5gCZ8=; h=Date:From:To:Cc:Subject:From; b=DGSZuOWZM8pCiYTIENJ0+s6W1KftyaOAof61s/j2aB0TyVlAm0by7Pud090LGTSrE sNmC6HGYoXcAG0Vv7yccphUoiWSvKu2KYHR0iyVodEdy6NklxJpwJh1hhO5q2O+d4Z qynJMnBl3mQ+BPSbmgfa18YodD//89wO/jAmE+D8K27EsfvPZA7rVAqoPuf8qr85UM Ne1GIZ3q6o+IpR+wVjL4Ih43JO0/R4qbZwM6uXarQ3RfB/AzE1lzNxddLJXvg1INV9 2sfVUEjtVTwa1WyCAt7wFKW4yxDGMciB6qtxEdYa/ggcLpnbmbspDrQXbQxm4Zbf+z quVc/yQoGro0A== Date: Wed, 20 Apr 2022 09:42:53 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Krzysztof Kozlowski Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the arm-soc tree with the samsung-krzk-fixes tree Message-ID: <20220420094253.2300b293@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220419_164304_338785_C8FC5F17 X-CRM114-Status: GOOD ( 21.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 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 --- 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 (), 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 linux-samsung-soc@vger.kernel.org if + you still use it. + Without such feedback, the platform will be removed after 2022. + if ARCH_S3C24XX config PLAT_S3C24XX