Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sat, 26 Sep 2020 12:50:26 -0700
From:   Olof Johansson <olof@lixom.net>
To:     Krzysztof Kozlowski <krzk@kernel.org>
Cc:     Arnd Bergmann <arnd@arndb.de>, arm@kernel.org, soc@kernel.org,
        Kukjin Kim <kgene@kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
Message-ID: <20200926195026.GA2230@lx2k>
References: <20200920160705.9651-1-krzk@kernel.org>
 <20200920160705.9651-5-krzk@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20200920160705.9651-5-krzk@kernel.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
Precedence: bulk

Hi,

On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote:
> Hi,
> 
> This will conflict around renamed/moved files:
> 
> 1. arch/arm/mach-s3c/s3c24xx.c:
>    Merge both changes to new location, so:
> =======
>  +#include "s3c24xx.h"
>  +#include "fb-core-s3c24xx.h"
>  +#include "nand-core-s3c24xx.h"
>  +#include "spi-core-s3c24xx.h"
>   
> - static struct map_desc s3c2416_iodesc[] __initdata = {
> + static struct map_desc s3c2416_iodesc[] __initdata __maybe_unused = {
> =======
> 
> 2. drivers/soc/samsung/Kconfig
>    Add DEBUG_LL && MMU to SAMSUNG_PM_DEBUG section, so:
> 
> =======
>   config EXYNOS_PM_DOMAINS
>   	bool "Exynos PM domains" if COMPILE_TEST
>  -	depends on PM_GENERIC_DOMAINS || COMPILE_TEST
>  +	depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST
>  +
>  +config SAMSUNG_PM_DEBUG
>  +	bool "Samsung PM Suspend debug"
>  +	depends on PM && DEBUG_KERNEL
>  +	depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
>  +	depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART
> ++	depends on DEBUG_LL && MMU
>  +	help
>  +	  Say Y here if you want verbose debugging from the PM Suspend and
>  +	  Resume code. See <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
>  +	  for more information.
>  +
> =======

I don't mind doing this conflict resolution, and will merge it now,
but next time you can just base this branch on the cleanup branch.


-Olof