Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 28 Jun 2019 09:16:34 +1000

Hi all,

On Fri, 21 Jun 2019 09:33:47 +1000 Stephen Rothwell <[email-masked]> 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