From mboxrd@z Thu Jan  1 00:00:00 1970
From: horms@verge.net.au (Simon Horman)
Date: Mon, 8 Apr 2013 12:32:09 +0900
Subject: [PATCH 00/02] ARM: shmobile: r8a7790 Lager arch timer fixes
In-Reply-To: <87ppy5oika.wl%kuninori.morimoto.gx@renesas.com>
References: <20130408012318.13555.58237.sendpatchset@w520>
 <87r4ilolmh.wl%kuninori.morimoto.gx@renesas.com>
 <20130408020637.GF13103@verge.net.au>
 <87ppy5oika.wl%kuninori.morimoto.gx@renesas.com>
Message-ID: <20130408033207.GA10151@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Sun, Apr 07, 2013 at 07:35:53PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > I guess shmobile_timer_init() will be conflict (or compile error)
> > > on next (?) merge window thought...
> > > but, for current code/branch
> > 
> > I guess that the solution is to ensure that patch 1 is applied
> > before patch 2. Am I missing something?
> 
> Sorry for my confusion
> I meant shmobile_timer_init() will be removed from ARM SoC side.
> But I'm not sure for detail

Ah yes.

That already causes multiple breakages in renesas-next.
I have responded to the thread on removing shmobile_timer_init()
accordingly.