From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tomasz Figa <t.figa@samsung.com>,
Rob Herring <rob.herring@calxeda.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Fri, 18 Jan 2013 14:24:57 +1100 [thread overview]
Message-ID: <20130118142457.796fa6b444cfc0f8c0cdff0a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
d99de316e599 ("ARM: EXYNOS: Add support for Exynos secure firmware") from
the samsung tree.
I fixed it up (as supplied - 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/mach-exynos4-dt.c
index 112d10e,ab1dacc..0000000
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -106,9 -107,11 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
.smp = smp_ops(exynos_smp_ops),
.init_irq = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
- .handle_irq = gic_handle_irq,
+ .init_early = exynos_firmware_init,
.init_machine = exynos4_dt_machine_init,
.init_late = exynos_init_late,
- .timer = &exynos4_timer,
+ .init_time = exynos4_timer_init,
.dt_compat = exynos4_dt_compat,
.restart = exynos4_restart,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tomasz Figa <t.figa@samsung.com>,
Rob Herring <rob.herring@calxeda.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Fri, 18 Jan 2013 14:24:57 +1100 [thread overview]
Message-ID: <20130118142457.796fa6b444cfc0f8c0cdff0a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
d99de316e599 ("ARM: EXYNOS: Add support for Exynos secure firmware") from
the samsung tree.
I fixed it up (as supplied - 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/mach-exynos4-dt.c
index 112d10e,ab1dacc..0000000
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -106,9 -107,11 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
.smp = smp_ops(exynos_smp_ops),
.init_irq = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
- .handle_irq = gic_handle_irq,
+ .init_early = exynos_firmware_init,
.init_machine = exynos4_dt_machine_init,
.init_late = exynos_init_late,
- .timer = &exynos4_timer,
+ .init_time = exynos4_timer_init,
.dt_compat = exynos4_dt_compat,
.restart = exynos4_restart,
MACHINE_END
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Fri, 18 Jan 2013 14:24:57 +1100 [thread overview]
Message-ID: <20130118142457.796fa6b444cfc0f8c0cdff0a@canb.auug.org.au> (raw)
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
d99de316e599 ("ARM: EXYNOS: Add support for Exynos secure firmware") from
the samsung tree.
I fixed it up (as supplied - see below) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index 112d10e,ab1dacc..0000000
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -106,9 -107,11 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
.smp = smp_ops(exynos_smp_ops),
.init_irq = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
- .handle_irq = gic_handle_irq,
+ .init_early = exynos_firmware_init,
.init_machine = exynos4_dt_machine_init,
.init_late = exynos_init_late,
- .timer = &exynos4_timer,
+ .init_time = exynos4_timer_init,
.dt_compat = exynos4_dt_compat,
.restart = exynos4_restart,
MACHINE_END
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130118/28fd50d2/attachment.sig>
next reply other threads:[~2013-01-18 3:25 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 3:24 Stephen Rothwell [this message]
2013-01-18 3:24 ` linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2013-01-18 3:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-07-21 1:13 Stephen Rothwell
2014-07-21 1:13 ` Stephen Rothwell
2014-07-21 1:13 ` Stephen Rothwell
2014-07-17 2:06 Stephen Rothwell
2014-07-17 2:06 ` Stephen Rothwell
2014-07-17 2:06 ` Stephen Rothwell
2014-07-17 2:01 Stephen Rothwell
2014-07-17 2:01 ` Stephen Rothwell
2014-07-17 2:01 ` Stephen Rothwell
2014-07-17 1:54 Stephen Rothwell
2014-07-17 1:54 ` Stephen Rothwell
2014-07-17 1:54 ` Stephen Rothwell
2014-05-26 0:17 Stephen Rothwell
2014-05-26 0:17 ` Stephen Rothwell
2014-05-26 0:17 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-03-23 23:30 Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2014-03-23 23:30 ` Stephen Rothwell
2013-04-05 5:02 Stephen Rothwell
2013-04-05 5:02 ` Stephen Rothwell
2013-04-05 5:02 ` Stephen Rothwell
2013-04-05 6:49 ` Kukjin Kim
2013-04-05 6:49 ` Kukjin Kim
2013-02-13 7:39 Stephen Rothwell
2013-02-13 7:39 ` Stephen Rothwell
2013-02-13 7:39 ` Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-01-30 14:48 ` Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-02-09 14:20 ` Grant Likely
2013-01-18 3:28 Stephen Rothwell
2013-01-18 3:28 ` Stephen Rothwell
2013-01-18 3:28 ` Stephen Rothwell
2013-01-18 3:21 Stephen Rothwell
2013-01-18 3:21 ` Stephen Rothwell
2013-01-18 3:21 ` Stephen Rothwell
2013-01-11 4:32 Stephen Rothwell
2013-01-11 4:32 ` Stephen Rothwell
2013-01-11 4:32 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:59 ` Stephen Rothwell
2013-01-17 5:59 ` Stephen Rothwell
2013-01-11 4:18 Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:19 ` Stephen Rothwell
2012-11-26 11:15 Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-11-26 11:15 ` Stephen Rothwell
2012-09-24 10:52 Stephen Rothwell
2012-09-24 10:52 ` Stephen Rothwell
2012-09-24 10:52 ` Stephen Rothwell
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=20130118142457.796fa6b444cfc0f8c0cdff0a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rob.herring@calxeda.com \
--cc=t.figa@samsung.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.