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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 25 Jun 2019 09:59:57 +1000

Hi all,

On Tue, 25 Jun 2019 09:59:06 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
> 
>   arch/arm/configs/s3c6400_defconfig
> 
> between commit:
> 
>   6c48edcc955a ("ARM: configs: Remove useless UEVENT_HELPER_PATH")
> 
> from the arm-soc tree and commit:
> 
>   5a96019ce5cd ("ARM: defconfig: samsung: Cleanup 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/s3c6400_defconfig
index 6eea99300f7f,34f9992ce8e9..000000000000
--- a/arch/arm/configs/s3c6400_defconfig
+++ b/arch/arm/configs/s3c6400_defconfig
@@@ -18,9 -15,12 +15,11 @@@ CONFIG_MACH_HMT=
  CONFIG_MACH_SMARTQ5=y
  CONFIG_MACH_SMARTQ7=y
  CONFIG_MACH_WLF_CRAGG_6410=y
- CONFIG_AEABI=y
  CONFIG_CMDLINE="console=ttySAC0,115200 root=/dev/ram init=/linuxrc initrd=0x51000000,6M ramdisk_size=6144"
  CONFIG_VFP=y
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+ CONFIG_MODULES=y
+ CONFIG_MODULE_UNLOAD=y
+ # CONFIG_BLK_DEV_BSG is not set
  CONFIG_MTD=y
  CONFIG_MTD_RAW_NAND=y
  CONFIG_MTD_NAND_S3C2410=y