* linux-next: manual merge of the samsung-krzk tree with the arm tree
@ 2021-12-19 22:40 Stephen Rothwell
2021-12-20 22:53 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-12-19 22:40 UTC (permalink / raw)
To: Krzysztof Kozlowski, Russell King
Cc: Ard Biesheuvel, Arnd Bergmann, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List, Sam Protsenko
[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]
Hi all,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/Kconfig
between commit:
54f481a2308e ("ARM: remove old-style irq entry")
from the arm tree and commit:
3ac5f9db26bb ("ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/Kconfig
index 15bc7fba0761,391f07c17096..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -471,7 -478,7 +471,6 @@@ config ARCH_S3C24X
select CLKSRC_SAMSUNG_PWM
select GPIO_SAMSUNG
select GPIOLIB
- select HAVE_S3C2410_I2C if I2C
- select GENERIC_IRQ_MULTI_HANDLER
select NEED_MACH_IO_H
select S3C2410_WATCHDOG
select SAMSUNG_ATAGS
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the arm tree
2021-12-19 22:40 linux-next: manual merge of the samsung-krzk tree with the arm tree Stephen Rothwell
@ 2021-12-20 22:53 ` Stephen Rothwell
2021-12-21 7:58 ` Krzysztof Kozlowski
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-12-20 22:53 UTC (permalink / raw)
To: Russell King, Olof Johansson, Arnd Bergmann
Cc: Krzysztof Kozlowski, Ard Biesheuvel, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List, Sam Protsenko,
ARM
[-- Attachment #1: Type: text/plain, Size: 1356 bytes --]
Hi all,
On Mon, 20 Dec 2021 09:40:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm/Kconfig
>
> between commit:
>
> 54f481a2308e ("ARM: remove old-style irq entry")
>
> from the arm tree and commit:
>
> 3ac5f9db26bb ("ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
>
> diff --cc arch/arm/Kconfig
> index 15bc7fba0761,391f07c17096..000000000000
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -471,7 -478,7 +471,6 @@@ config ARCH_S3C24X
> select CLKSRC_SAMSUNG_PWM
> select GPIO_SAMSUNG
> select GPIOLIB
> - select HAVE_S3C2410_I2C if I2C
> - select GENERIC_IRQ_MULTI_HANDLER
> select NEED_MACH_IO_H
> select S3C2410_WATCHDOG
> select SAMSUNG_ATAGS
This is now a conflict between the arm and arm-soc trees.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the arm tree
2021-12-20 22:53 ` Stephen Rothwell
@ 2021-12-21 7:58 ` Krzysztof Kozlowski
0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-12-21 7:58 UTC (permalink / raw)
To: Stephen Rothwell, Russell King, Olof Johansson, Arnd Bergmann
Cc: Krzysztof Kozlowski, Ard Biesheuvel, Linux Kernel Mailing List,
Linux Next Mailing List, Sam Protsenko, ARM
On 20/12/2021 23:53, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 20 Dec 2021 09:40:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>>
>> arch/arm/Kconfig
>>
>> between commit:
>>
>> 54f481a2308e ("ARM: remove old-style irq entry")
>>
>> from the arm tree and commit:
>>
>> 3ac5f9db26bb ("ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies")
>>
>> from the samsung-krzk tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>>
>> diff --cc arch/arm/Kconfig
>> index 15bc7fba0761,391f07c17096..000000000000
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@@ -471,7 -478,7 +471,6 @@@ config ARCH_S3C24X
>> select CLKSRC_SAMSUNG_PWM
>> select GPIO_SAMSUNG
>> select GPIOLIB
>> - select HAVE_S3C2410_I2C if I2C
>> - select GENERIC_IRQ_MULTI_HANDLER
>> select NEED_MACH_IO_H
>> select S3C2410_WATCHDOG
>> select SAMSUNG_ATAGS
>
> This is now a conflict between the arm and arm-soc trees.
>
Thanks for letting us know.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the samsung-krzk tree with the arm tree
@ 2019-06-20 23:33 Stephen Rothwell
2019-06-27 23:16 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2019-06-20 23:33 UTC (permalink / raw)
To: Krzysztof Kozlowski, Russell King
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Marek Szyprowski
[-- Attachment #1: Type: text/plain, Size: 1313 bytes --]
Hi all,
Today's linux-next merge of the samsung-krzk tree got a conflict in:
arch/arm/configs/exynos_defconfig
between commit:
5f41f9198f29 ("ARM: 8864/1: Add workaround for I-Cache line size mismatch between CPU cores")
from the arm tree and commit:
9f532d26c75c ("ARM: exynos_defconfig: Trim and reorganize with savedefconfig")
from the samsung-krzk tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/configs/exynos_defconfig
index 9b959afaaa12,f140532ddca7..000000000000
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT=
CONFIG_CGROUPS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_PERF_EVENTS=y
- CONFIG_MODULES=y
- CONFIG_MODULE_UNLOAD=y
- CONFIG_PARTITION_ADVANCED=y
CONFIG_ARCH_EXYNOS=y
- CONFIG_ARCH_EXYNOS3=y
+CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
CONFIG_SMP=y
CONFIG_BIG_LITTLE=y
CONFIG_NR_CPUS=8
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the arm tree
2019-06-20 23:33 Stephen Rothwell
@ 2019-06-27 23:16 ` Stephen Rothwell
2019-07-09 0:12 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2019-06-27 23:16 UTC (permalink / raw)
To: Russell King, Olof Johansson, Arnd Bergmann
Cc: Krzysztof Kozlowski, Linux Next Mailing List,
Linux Kernel Mailing List, Marek Szyprowski, ARM
[-- Attachment #1: Type: text/plain, Size: 1545 bytes --]
Hi all,
On Fri, 21 Jun 2019 09:33:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>
> arch/arm/configs/exynos_defconfig
>
> between commit:
>
> 5f41f9198f29 ("ARM: 8864/1: Add workaround for I-Cache line size mismatch between CPU cores")
>
> from the arm tree and commit:
>
> 9f532d26c75c ("ARM: exynos_defconfig: Trim and reorganize with savedefconfig")
>
> from the samsung-krzk tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc arch/arm/configs/exynos_defconfig
> index 9b959afaaa12,f140532ddca7..000000000000
> --- a/arch/arm/configs/exynos_defconfig
> +++ b/arch/arm/configs/exynos_defconfig
> @@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT=
> CONFIG_CGROUPS=y
> CONFIG_BLK_DEV_INITRD=y
> CONFIG_PERF_EVENTS=y
> - CONFIG_MODULES=y
> - CONFIG_MODULE_UNLOAD=y
> - CONFIG_PARTITION_ADVANCED=y
> CONFIG_ARCH_EXYNOS=y
> - CONFIG_ARCH_EXYNOS3=y
> +CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
> CONFIG_SMP=y
> CONFIG_BIG_LITTLE=y
> CONFIG_NR_CPUS=8
This is now a conflict between the arm-soc tree and the arm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the samsung-krzk tree with the arm tree
2019-06-27 23:16 ` Stephen Rothwell
@ 2019-07-09 0:12 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2019-07-09 0:12 UTC (permalink / raw)
To: Russell King, Olof Johansson, Arnd Bergmann
Cc: Krzysztof Kozlowski, Linux Next Mailing List,
Linux Kernel Mailing List, Marek Szyprowski, ARM
[-- Attachment #1: Type: text/plain, Size: 1848 bytes --]
Hi all,
On Fri, 28 Jun 2019 09:16:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Fri, 21 Jun 2019 09:33:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the samsung-krzk tree got a conflict in:
> >
> > arch/arm/configs/exynos_defconfig
> >
> > between commit:
> >
> > 5f41f9198f29 ("ARM: 8864/1: Add workaround for I-Cache line size mismatch between CPU cores")
> >
> > from the arm tree and commit:
> >
> > 9f532d26c75c ("ARM: exynos_defconfig: Trim and reorganize with savedefconfig")
> >
> > from the samsung-krzk tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > diff --cc arch/arm/configs/exynos_defconfig
> > index 9b959afaaa12,f140532ddca7..000000000000
> > --- a/arch/arm/configs/exynos_defconfig
> > +++ b/arch/arm/configs/exynos_defconfig
> > @@@ -4,12 -5,7 +5,8 @@@ CONFIG_PREEMPT=
> > CONFIG_CGROUPS=y
> > CONFIG_BLK_DEV_INITRD=y
> > CONFIG_PERF_EVENTS=y
> > - CONFIG_MODULES=y
> > - CONFIG_MODULE_UNLOAD=y
> > - CONFIG_PARTITION_ADVANCED=y
> > CONFIG_ARCH_EXYNOS=y
> > - CONFIG_ARCH_EXYNOS3=y
> > +CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND=y
> > CONFIG_SMP=y
> > CONFIG_BIG_LITTLE=y
> > CONFIG_NR_CPUS=8
>
> This is now a conflict between the arm-soc tree and the arm tree.
I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-21 7:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-19 22:40 linux-next: manual merge of the samsung-krzk tree with the arm tree Stephen Rothwell
2021-12-20 22:53 ` Stephen Rothwell
2021-12-21 7:58 ` Krzysztof Kozlowski
-- strict thread matches above, loose matches on Subject: below --
2019-06-20 23:33 Stephen Rothwell
2019-06-27 23:16 ` Stephen Rothwell
2019-07-09 0:12 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox