Re: linux-next: manual merge of the renesas tree with Linus' tree

2013-05-15 Thread Stephen Rothwell
Hi Simon, On Thu, 16 May 2013 14:04:53 +0900 Simon Horman wrote: > > Sorry about that. I am working on re-basing my branches on > top of v3.10-rc1 and I have confirmed that in my current local > branches the problem you describe is no longer present. > I plan to push the refreshed branches, inclu

Re: linux-next: manual merge of the renesas tree with Linus' tree

2013-05-15 Thread Simon Horman
On Thu, May 16, 2013 at 01:22:53PM +1000, Stephen Rothwell wrote: > Hi Simon, > > Today's linux-next merge of the renesas tree got a conflict in > arch/arm/mach-shmobile/board-lager.c between commit 65be2de17aae ("ARM: > shmobile: use r8a7790 timer setup code on Lager") from Linus' tree and > comm

linux-next: manual merge of the renesas tree with Linus' tree

2013-05-15 Thread Stephen Rothwell
Hi Simon, Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/board-lager.c between commit 65be2de17aae ("ARM: shmobile: use r8a7790 timer setup code on Lager") from Linus' tree and commit 993340a1390d ("ARM: shmobile: use r8a7790 timer setup code on Lager") from

linux-next: manual merge of the renesas tree with Linus' tree

2013-03-11 Thread Stephen Rothwell
Hi Simon, Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM: mach-shmobile: sh73a0: Add IPMMU device") from the tree and commits 73b21f40b61c ("ARM: shmobile: sh73a0: Do not use early devices with DT reference")

Re: linux-next: manual merge of the renesas tree with Linus' tree

2013-02-26 Thread Simon Horman
On Wed, Feb 27, 2013 at 12:17:06PM +1100, Stephen Rothwell wrote: > Hi Simon, > > Today's linux-next merge of the renesas tree got a conflict in > arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM: > mach-shmobile: sh73a0: Add IPMMU device") from Linus' tree and commit > 73b2

linux-next: manual merge of the renesas tree with Linus' tree

2013-02-26 Thread Stephen Rothwell
Hi Simon, Today's linux-next merge of the renesas tree got a conflict in arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM: mach-shmobile: sh73a0: Add IPMMU device") from Linus' tree and commit 73b21f40b61c ("ARM: shmobile: sh73a0: Do not use early devices with DT reference")