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
