From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
arm@kernel.org, soc@kernel.org
Cc: Sam Protsenko <semen.protsenko@linaro.org>,
Chanho Park <chanho61.park@samsung.com>,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: Re: [GIT PULL 4/6] ARM: samsung: for v5.17
Date: Mon, 20 Dec 2021 18:21:24 +0100 [thread overview]
Message-ID: <09d4e9d8-6bfa-5676-50cc-49bfc947b444@canonical.com> (raw)
In-Reply-To: <20211220115530.30961-3-krzysztof.kozlowski@canonical.com>
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
prev parent reply other threads:[~2021-12-20 17:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-20 11:53 [GIT PULL 0/6] Samsung " Krzysztof Kozlowski
2021-12-20 11:54 ` [GIT PULL 1/6] samsung: soc: drivers: " Krzysztof Kozlowski
2021-12-20 16:26 ` Arnd Bergmann
2021-12-20 16:48 ` Krzysztof Kozlowski
2021-12-20 11:55 ` [GIT PULL 2/6] ARM: dts: samsung: " Krzysztof Kozlowski
2021-12-20 11:55 ` [GIT PULL 3/6] arm64: " Krzysztof Kozlowski
2021-12-20 11:55 ` [GIT PULL 4/6] ARM: " Krzysztof Kozlowski
2021-12-20 17:21 ` Krzysztof Kozlowski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=09d4e9d8-6bfa-5676-50cc-49bfc947b444@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=chanho61.park@samsung.com \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
--cc=semen.protsenko@linaro.org \
--cc=soc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®