From: Olof Johansson <olof@lixom.net>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
ARM-SoC Maintainers <arm@kernel.org>, SoC Team <soc@kernel.org>,
Kukjin Kim <kgene@kernel.org>,
Linux ARM Mailing List <linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES"
<linux-samsung-soc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
Date: Sat, 3 Oct 2020 21:29:58 +0200 [thread overview]
Message-ID: <CAOesGMgQ67n1F-od-amKN8MuG75V3euOhEwdyYryQSQyWH3TBQ@mail.gmail.com> (raw)
In-Reply-To: <20200926195026.GA2230@lx2k>
On Sat, Oct 3, 2020 at 9:29 PM Olof Johansson <olof@lixom.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
WARNING: multiple messages have this Message-ID (diff)
From: Olof Johansson <olof@lixom.net>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: "moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES"
<linux-samsung-soc@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
SoC Team <soc@kernel.org>, ARM-SoC Maintainers <arm@kernel.org>,
Kukjin Kim <kgene@kernel.org>,
Linux ARM Mailing List <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
Date: Sat, 3 Oct 2020 21:29:58 +0200 [thread overview]
Message-ID: <CAOesGMgQ67n1F-od-amKN8MuG75V3euOhEwdyYryQSQyWH3TBQ@mail.gmail.com> (raw)
In-Reply-To: <20200926195026.GA2230@lx2k>
On Sat, Oct 3, 2020 at 9:29 PM Olof Johansson <olof@lixom.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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-10-03 19:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 16:07 [GIT PULL 0/5] Second pull round for Samsung SoC Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 1/5] ARM: defconfig: changes for v5.10 Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 2/5] ARM: dts: samsung " Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 3/5] arm64: dts: exynos " Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 4/5] ARM: samsung: mach/soc " Krzysztof Kozlowski
2020-09-26 19:50 ` Olof Johansson
2020-09-26 19:50 ` Olof Johansson
2020-10-03 19:29 ` Olof Johansson [this message]
2020-10-03 19:29 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOesGMgQ67n1F-od-amKN8MuG75V3euOhEwdyYryQSQyWH3TBQ@mail.gmail.com \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=soc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.