From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alim Akhtar <alim.akhtar@samsung•com>
Subject: linux-next: manual merge of the clockevents tree with the samsung-krzk tree
Date: Mon, 23 Nov 2015 12:22:47 +1100 [thread overview]
Message-ID: <20151123122247.23eb6f3d@canb.auug.org.au> (raw)
Hi Daniel,
Today's linux-next merge of the clockevents tree got a conflict in:
arch/arm/mach-exynos/Kconfig
between commit:
23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff")
from the samsung-krzk tree and commit:
b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option")
from the clockevents tree.
OK, so these entries were sorted at one point for a reason :-(
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-exynos/Kconfig
index d279edf9b10d,ff105399aae4..000000000000
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -14,6 -14,6 +14,7 @@@ menuconfig ARCH_EXYNO
select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA
select ARM_GIC
++ select CLKSRC_EXYNOS_MCT
select COMMON_CLK_SAMSUNG
select EXYNOS_THERMAL
select HAVE_ARM_SCU if SMP
@@@ -23,13 -23,11 +24,13 @@@
select PINCTRL
select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM
++ select POWER_RESET
++ select POWER_RESET_SYSCON
++ select POWER_RESET_SYSCON_POWEROFF
select S5P_DEV_MFC
select SRAM
select THERMAL
select MFD_SYSCON
- select POWER_RESET
- select POWER_RESET_SYSCON
- select POWER_RESET_SYSCON_POWEROFF
- select CLKSRC_EXYNOS_MCT
help
Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
next reply other threads:[~2015-11-23 1:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 1:22 Stephen Rothwell [this message]
2015-11-23 1:45 ` linux-next: manual merge of the clockevents tree with the samsung-krzk tree Krzysztof Kozlowski
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=20151123122247.23eb6f3d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alim.akhtar@samsung$(echo .)com \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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