* shmobile and struct sys_timer removal conflicts
@ 2013-01-14 17:52 Stephen Warren
2013-01-15 0:42 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2013-01-14 17:52 UTC (permalink / raw)
To: linux-arm-kernel
Simon,
I notice that the following shmobile-related commits in next-20130114
add new ARM machine descriptors, but set the .timer field rather than
the new .init_time field. I believe the code in these commits won't
build in linux-next or Linux 3.9 once it's released:
a625586 ARM: mach-shmobile: kzm9g: Reference DT implementation
ac0876f ARM: shmobile: armadillo800eva: Reference DT implementation
be1fc65 ARM: shmobile: add a reference DT implementation for mackerel
66f1162 ARM: mach-shmobile: sh73a0: Minimal setup using DT
In order to solve this problem, you'll need to adjust those changes
according to:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git timer/cleanup
(where "adjust" is probably "rebase on top of")
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: shmobile and struct sys_timer removal conflicts
2013-01-14 17:52 shmobile and struct sys_timer removal conflicts Stephen Warren
@ 2013-01-15 0:42 ` Simon Horman
2013-01-21 0:39 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2013-01-15 0:42 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 14, 2013 at 10:52:37AM -0700, Stephen Warren wrote:
> Simon,
>
> I notice that the following shmobile-related commits in next-20130114
> add new ARM machine descriptors, but set the .timer field rather than
> the new .init_time field. I believe the code in these commits won't
> build in linux-next or Linux 3.9 once it's released:
>
> a625586 ARM: mach-shmobile: kzm9g: Reference DT implementation
> ac0876f ARM: shmobile: armadillo800eva: Reference DT implementation
> be1fc65 ARM: shmobile: add a reference DT implementation for mackerel
> 66f1162 ARM: mach-shmobile: sh73a0: Minimal setup using DT
>
> In order to solve this problem, you'll need to adjust those changes
> according to:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git timer/cleanup
>
> (where "adjust" is probably "rebase on top of")
Hi Stephen,
thanks. I'll get this sorted out.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: shmobile and struct sys_timer removal conflicts
2013-01-15 0:42 ` Simon Horman
@ 2013-01-21 0:39 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2013-01-21 0:39 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 15, 2013 at 09:42:30AM +0900, Simon Horman wrote:
> On Mon, Jan 14, 2013 at 10:52:37AM -0700, Stephen Warren wrote:
> > Simon,
> >
> > I notice that the following shmobile-related commits in next-20130114
> > add new ARM machine descriptors, but set the .timer field rather than
> > the new .init_time field. I believe the code in these commits won't
> > build in linux-next or Linux 3.9 once it's released:
> >
> > a625586 ARM: mach-shmobile: kzm9g: Reference DT implementation
> > ac0876f ARM: shmobile: armadillo800eva: Reference DT implementation
> > be1fc65 ARM: shmobile: add a reference DT implementation for mackerel
> > 66f1162 ARM: mach-shmobile: sh73a0: Minimal setup using DT
> >
> > In order to solve this problem, you'll need to adjust those changes
> > according to:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git timer/cleanup
> >
> > (where "adjust" is probably "rebase on top of")
>
> Hi Stephen,
>
> thanks. I'll get this sorted out.
This should be resolved in the next branch of the renesas tree now.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-21 0:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 17:52 shmobile and struct sys_timer removal conflicts Stephen Warren
2013-01-15 0:42 ` Simon Horman
2013-01-21 0:39 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).