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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- 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 --]