* linux-next: manual merge of the samsung tree with Linus' tree
@ 2013-06-20 7:36 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2013-06-20 7:36 UTC (permalink / raw)
To: Kukjin Kim
Cc: linux-next, linux-kernel, Tushar Behera, Mike Turquette,
Sachin Kamat
[-- Attachment #1: Type: text/plain, Size: 1579 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
drivers/clk/samsung/clk-exynos5250.c between commit 39b72d89eb2b ("clk:
exynos5250: Update cpufreq related clocks for EXYNOS5250") from Linus'
tree and commit 407e8d62fa7d ("clk: exynos5250: Staticize local symbols")
from the samsung tree.
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 drivers/clk/samsung/clk-exynos5250.c
index 22d7699,f6e3031..0000000
--- a/drivers/clk/samsung/clk-exynos5250.c
+++ b/drivers/clk/samsung/clk-exynos5250.c
@@@ -207,11 -213,11 +213,11 @@@ static struct samsung_fixed_factor_cloc
FFACTOR(none, "fout_bplldiv2", "fout_bpll", 1, 2, 0),
};
- struct samsung_mux_clock exynos5250_mux_clks[] __initdata = {
+ static struct samsung_mux_clock exynos5250_mux_clks[] __initdata = {
- MUX(none, "mout_apll", mout_apll_p, SRC_CPU, 0, 1),
- MUX(none, "mout_cpu", mout_cpu_p, SRC_CPU, 16, 1),
+ MUX_A(none, "mout_apll", mout_apll_p, SRC_CPU, 0, 1, "mout_apll"),
+ MUX_A(none, "mout_cpu", mout_cpu_p, SRC_CPU, 16, 1, "mout_cpu"),
MUX(none, "mout_mpll_fout", mout_mpll_fout_p, PLL_DIV2_SEL, 4, 1),
- MUX(none, "sclk_mpll", mout_mpll_p, SRC_CORE1, 8, 1),
+ MUX_A(none, "sclk_mpll", mout_mpll_p, SRC_CORE1, 8, 1, "mout_mpll"),
MUX(none, "mout_bpll_fout", mout_bpll_fout_p, PLL_DIV2_SEL, 0, 1),
MUX(none, "sclk_bpll", mout_bpll_p, SRC_CDREX, 0, 1),
MUX(none, "mout_vpllsrc", mout_vpllsrc_p, SRC_TOP2, 0, 1),
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the samsung tree with Linus' tree
@ 2014-06-12 0:43 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-06-12 0:43 UTC (permalink / raw)
To: Kukjin Kim, Russell King; +Cc: linux-next, linux-kernel, Santosh Shukla
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/sleep.S between commit 25a9ef63cd2b ("ARM: l2c:
exynos: convert to common l2c310 early resume functionality") from
Linus' tree and commit af728bd84cc8 ("ARM: EXYNOS: Fix build error with
thumb2") from the samsung tree.
I fixed it up (the former removed the code updated by the latter) and
can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-12 0:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-12 0:43 linux-next: manual merge of the samsung tree with Linus' tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-06-20 7:36 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox