* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
[not found] ` <20200920160705.9651-5-krzk@kernel.org>
@ 2020-09-26 19:50 ` Olof Johansson
2020-10-03 19:29 ` Olof Johansson
0 siblings, 1 reply; 2+ messages in thread
From: Olof Johansson @ 2020-09-26 19:50 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Arnd Bergmann, arm, soc, Kukjin Kim, linux-arm-kernel,
linux-samsung-soc, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
2020-09-26 19:50 ` [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10 Olof Johansson
@ 2020-10-03 19:29 ` Olof Johansson
0 siblings, 0 replies; 2+ messages in thread
From: Olof Johansson @ 2020-10-03 19:29 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Arnd Bergmann, ARM-SoC Maintainers, SoC Team, Kukjin Kim,
Linux ARM Mailing List,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-03 19:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200920160705.9651-1-krzk@kernel.org>
[not found] ` <20200920160705.9651-5-krzk@kernel.org>
2020-09-26 19:50 ` [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10 Olof Johansson
2020-10-03 19:29 ` Olof Johansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®