Re: [GIT PULL 4/6] ARM: samsung: for v5.17

[Krzysztof Kozlowski]

On 20/12/2021 12:55, Krzysztof Kozlowski wrote:
> The following changes since commit fa55b7dcdc43c1aa1ba12bca9d2dd4318c2a0dbf:
> 
>   Linux 5.16-rc1 (2021-11-14 13:56:52 -0800)
> 
> are available in the Git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-5.17
> 
> for you to fetch changes up to 3ac5f9db26bb7a227ccbf160c36a5567b5394299:
> 
>   ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies (2021-11-21 17:46:18 +0100)
> 
> ----------------------------------------------------------------
> Samsung mach/soc changes for v5.17
> 
> 1. Minor fixes for S3C platforms.
> 2. Remove HAVE_S3C2410_I2C Kconfig symbol - not really useful.
> 
> ----------------------------------------------------------------
> Arnd Bergmann (1):
>       ARM: s3c: add one more "fallthrough" statement in Jive
> 
> Krzysztof Kozlowski (1):
>       ARM: s3c: include header for prototype of s3c2410_modify_misccr
> 
> Sam Protsenko (1):
>       ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies
> 

Hi Arnd and Olof,

I forgot to mention possible conflict here with arm tree. Conflict is
easy to resolve - just remove lines in all cases like:

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


Best regards,
Krzysztof