linux-kernel - Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAOesGMgQ67n1F-od-amKN8MuG75V3euOhEwdyYryQSQyWH3TBQ@mail.gmail.com>
Date:   Sat, 3 Oct 2020 21:29:58 +0200
From:   Olof Johansson <olof@...om.net>
To:     Krzysztof Kozlowski <krzk@...nel.org>
Cc:     Arnd Bergmann <arnd@...db.de>,
        ARM-SoC Maintainers <arm@...nel.org>,
        SoC Team <soc@...nel.org>, Kukjin Kim <kgene@...nel.org>,
        Linux ARM Mailing List <linux-arm-kernel@...ts.infradead.org>,
        "moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES" 
        <linux-samsung-soc@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10

On Sat, Oct 3, 2020 at 9:29 PM Olof Johansson <olof@...om.net> wrote:
>
> 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.

Apologies for sitting on this email, I flush the outbound queue by
hand and seem to have forgotten. :)


-Olof